diff options
author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-02-04 14:56:49 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-07 20:04:50 -0500 |
commit | 91a99dfc6b57f2e956d10d41123234fad3399212 (patch) | |
tree | 8b27b172d8964b3f85b7d9203ff021707975ed1e | |
parent | 831fad2f75f0d7bfc339de81173e7068a3c72276 (diff) |
platform-drivers: move probe to .devinit.text in arch/arm
A pointer to a probe callback is passed to the core via
platform_driver_register and so the function must not disappear when the
.init sections are discarded. Otherwise (if also having HOTPLUG=y)
unbinding and binding a device to the driver via sysfs will result in an
oops as does a device being registered late.
An alternative to this patch is using platform_driver_probe instead of
platform_driver_register plus removing the pointer to the probe function
from the struct platform_driver.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Dmitry Baryshkov <dbaryshkov@gmail.com>
Cc: Eric Miao <eric.miao@marvell.com>
Cc: Liam Girdwood <liam.girdwood@wolfsonmicro.com>
Cc: Paul Sokolovsky <pmiscml@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Kristoffer Ericson <kristoffer.ericson@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | arch/arm/mach-pxa/corgi_ssp.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/sharpsl_pm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/h1940-bluetooth.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/jornada720_ssp.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c index a5ee70735e0..1d9bc118ee3 100644 --- a/arch/arm/mach-pxa/corgi_ssp.c +++ b/arch/arm/mach-pxa/corgi_ssp.c | |||
@@ -204,7 +204,7 @@ void __init corgi_ssp_set_machinfo(struct corgissp_machinfo *machinfo) | |||
204 | ssp_machinfo = machinfo; | 204 | ssp_machinfo = machinfo; |
205 | } | 205 | } |
206 | 206 | ||
207 | static int __init corgi_ssp_probe(struct platform_device *dev) | 207 | static int __devinit corgi_ssp_probe(struct platform_device *dev) |
208 | { | 208 | { |
209 | int ret; | 209 | int ret; |
210 | 210 | ||
diff --git a/arch/arm/mach-pxa/sharpsl_pm.c b/arch/arm/mach-pxa/sharpsl_pm.c index 67229a1ef55..463d874bb86 100644 --- a/arch/arm/mach-pxa/sharpsl_pm.c +++ b/arch/arm/mach-pxa/sharpsl_pm.c | |||
@@ -900,7 +900,7 @@ static struct platform_suspend_ops sharpsl_pm_ops = { | |||
900 | }; | 900 | }; |
901 | #endif | 901 | #endif |
902 | 902 | ||
903 | static int __init sharpsl_pm_probe(struct platform_device *pdev) | 903 | static int __devinit sharpsl_pm_probe(struct platform_device *pdev) |
904 | { | 904 | { |
905 | int ret; | 905 | int ret; |
906 | 906 | ||
diff --git a/arch/arm/mach-s3c2410/h1940-bluetooth.c b/arch/arm/mach-s3c2410/h1940-bluetooth.c index b7d1f8d27bc..a3f3c7b1ca3 100644 --- a/arch/arm/mach-s3c2410/h1940-bluetooth.c +++ b/arch/arm/mach-s3c2410/h1940-bluetooth.c | |||
@@ -56,7 +56,7 @@ static const struct rfkill_ops h1940bt_rfkill_ops = { | |||
56 | .set_block = h1940bt_set_block, | 56 | .set_block = h1940bt_set_block, |
57 | }; | 57 | }; |
58 | 58 | ||
59 | static int __init h1940bt_probe(struct platform_device *pdev) | 59 | static int __devinit h1940bt_probe(struct platform_device *pdev) |
60 | { | 60 | { |
61 | struct rfkill *rfk; | 61 | struct rfkill *rfk; |
62 | int ret = 0; | 62 | int ret = 0; |
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c index 506a5e5a9ad..9b6dee5d16d 100644 --- a/arch/arm/mach-sa1100/jornada720_ssp.c +++ b/arch/arm/mach-sa1100/jornada720_ssp.c | |||
@@ -130,7 +130,7 @@ void jornada_ssp_end(void) | |||
130 | }; | 130 | }; |
131 | EXPORT_SYMBOL(jornada_ssp_end); | 131 | EXPORT_SYMBOL(jornada_ssp_end); |
132 | 132 | ||
133 | static int __init jornada_ssp_probe(struct platform_device *dev) | 133 | static int __devinit jornada_ssp_probe(struct platform_device *dev) |
134 | { | 134 | { |
135 | int ret; | 135 | int ret; |
136 | 136 | ||