diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-30 16:23:35 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-05-30 16:23:35 -0700 |
| commit | cd9f6ed81e278f7a5b8984132fde66b61e0bb856 (patch) | |
| tree | 1b7b6591b5fd0c320586b2bba3c69aaa2479f159 /driver | |
| parent | 296ad66450ec0a4bc41b44d2b1bb86cbff182f2e (diff) | |
| download | patches-cd9f6ed81e278f7a5b8984132fde66b61e0bb856.tar.gz | |
updated patch
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/platform_bus-learns-about-modalias.patch | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/driver/platform_bus-learns-about-modalias.patch b/driver/platform_bus-learns-about-modalias.patch index 47345ef6f1d1d..fb1b6f9ffe465 100644 --- a/driver/platform_bus-learns-about-modalias.patch +++ b/driver/platform_bus-learns-about-modalias.patch @@ -1,11 +1,11 @@ -From david-b@pacbell.net Mon May 1 14:05:05 2006 +From david-b@pacbell.net Mon May 29 10:37:39 2006 From: David Brownell <david-b@pacbell.net> To: Greg KH <greg@kroah.com> Subject: platform_bus learns about modalias -Date: Mon, 1 May 2006 11:16:01 -0700 +Date: Mon, 29 May 2006 10:37:33 -0700 Cc: Russell King <rmk@arm.linux.org.uk>, Linux Kernel list <linux-kernel@vger.kernel.org> -Message-Id: <200605011116.02250.david-b@pacbell.net> +Message-Id: <200605291037.34305.david-b@pacbell.net> This patch adds modalias support to platform devices, for simpler hotplug/coldplug driven driver setup. @@ -14,12 +14,12 @@ Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/base/platform.c | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) + drivers/base/platform.c | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) --- gregkh-2.6.orig/drivers/base/platform.c +++ gregkh-2.6/drivers/base/platform.c -@@ -452,6 +452,40 @@ void platform_driver_unregister(struct p +@@ -452,6 +452,37 @@ void platform_driver_unregister(struct p EXPORT_SYMBOL_GPL(platform_driver_unregister); @@ -33,12 +33,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +modalias_show(struct device *dev, struct device_attribute *a, char *buf) +{ + struct platform_device *pdev = to_platform_device(dev); -+ unsigned len = strlen(pdev->name); ++ int len = snprintf(buf, PAGE_SIZE, "%s\n", pdev->name); + -+ len = min_t(unsigned, len, PAGE_SIZE - 1); -+ memcpy(buf, pdev->name, len); -+ buf[PAGE_SIZE - 1] = 0; -+ return len; ++ return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len; +} + +static struct device_attribute platform_dev_attrs[] = { @@ -60,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /** * platform_match - bind platform device to platform driver. * @dev: device. -@@ -496,7 +530,9 @@ static int platform_resume(struct device +@@ -496,7 +527,9 @@ static int platform_resume(struct device struct bus_type platform_bus_type = { .name = "platform", |