diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-12-21 16:18:33 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-03 18:57:03 -0500 |
commit | b859f15921321b7bf4cb4cf188e31a6a25d2dff3 (patch) | |
tree | 551312f637cc2c27959f89742b1ee28baa4a46c7 /drivers/platform/x86/xo1-rfkill.c | |
parent | 4c62e9764ab403d42f9b8871b1241fe7812f19d4 (diff) |
Drivers: platform: x86: remove __dev* attributes.
CONFIG_HOTPLUG is going away as an option. As a result, the __dev*
markings need to be removed.
This change removes the use of __devinit, __devexit_p, __devinitdata,
__devinitconst, and __devexit from these drivers.
Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Joey Lee <jlee@novell.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Peter Feuerer <peter@piie.net>
Cc: Corentin Chary <corentin.chary@gmail.com>
Cc: Cezary Jackiewicz <cezary.jackiewicz@gmail.com>
Cc: Robert Gerlach <khnz@gmx.de>
Cc: Ike Panhc <ike.pan@canonical.com>
Cc: Henrique de Moraes Holschuh <ibm-acpi@hmh.eng.br>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/platform/x86/xo1-rfkill.c')
-rw-r--r-- | drivers/platform/x86/xo1-rfkill.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/platform/x86/xo1-rfkill.c b/drivers/platform/x86/xo1-rfkill.c index 1da13ed34b04..4bd17248dfc6 100644 --- a/drivers/platform/x86/xo1-rfkill.c +++ b/drivers/platform/x86/xo1-rfkill.c | |||
@@ -40,7 +40,7 @@ static const struct rfkill_ops rfkill_ops = { | |||
40 | .set_block = rfkill_set_block, | 40 | .set_block = rfkill_set_block, |
41 | }; | 41 | }; |
42 | 42 | ||
43 | static int __devinit xo1_rfkill_probe(struct platform_device *pdev) | 43 | static int xo1_rfkill_probe(struct platform_device *pdev) |
44 | { | 44 | { |
45 | struct rfkill *rfk; | 45 | struct rfkill *rfk; |
46 | int r; | 46 | int r; |
@@ -60,7 +60,7 @@ static int __devinit xo1_rfkill_probe(struct platform_device *pdev) | |||
60 | return 0; | 60 | return 0; |
61 | } | 61 | } |
62 | 62 | ||
63 | static int __devexit xo1_rfkill_remove(struct platform_device *pdev) | 63 | static int xo1_rfkill_remove(struct platform_device *pdev) |
64 | { | 64 | { |
65 | struct rfkill *rfk = platform_get_drvdata(pdev); | 65 | struct rfkill *rfk = platform_get_drvdata(pdev); |
66 | rfkill_unregister(rfk); | 66 | rfkill_unregister(rfk); |
@@ -74,7 +74,7 @@ static struct platform_driver xo1_rfkill_driver = { | |||
74 | .owner = THIS_MODULE, | 74 | .owner = THIS_MODULE, |
75 | }, | 75 | }, |
76 | .probe = xo1_rfkill_probe, | 76 | .probe = xo1_rfkill_probe, |
77 | .remove = __devexit_p(xo1_rfkill_remove), | 77 | .remove = xo1_rfkill_remove, |
78 | }; | 78 | }; |
79 | 79 | ||
80 | module_platform_driver(xo1_rfkill_driver); | 80 | module_platform_driver(xo1_rfkill_driver); |