diff options
author | Axel Lin <axel.lin@gmail.com> | 2011-11-25 23:14:37 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-03-20 12:02:04 -0400 |
commit | 73d99a224435f25976a29c3aef53590180cdb774 (patch) | |
tree | a4a27169d4a53b82782c3874c2aca090b9966c82 /drivers/platform/x86 | |
parent | b94e88bcb35b321b55ff4517c10eeec16079d46f (diff) |
platform-drivers-x86: convert drivers/platform/x86/* to use module_platform_driver()
This patch converts the drivers in drivers/platform/x86/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.
Cc: Hong Liu <hong.liu@intel.com>
Cc: Durgadoss R <durgadoss.r@intel.com>
Cc: Daniel Drake <dsd@laptop.org>
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers/platform/x86')
-rw-r--r-- | drivers/platform/x86/intel_mid_powerbtn.c | 12 | ||||
-rw-r--r-- | drivers/platform/x86/intel_mid_thermal.c | 13 | ||||
-rw-r--r-- | drivers/platform/x86/xo1-rfkill.c | 13 |
3 files changed, 3 insertions, 35 deletions
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c index f1ae5078b7ec..ff3de343b64c 100644 --- a/drivers/platform/x86/intel_mid_powerbtn.c +++ b/drivers/platform/x86/intel_mid_powerbtn.c | |||
@@ -118,17 +118,7 @@ static struct platform_driver mfld_pb_driver = { | |||
118 | .remove = __devexit_p(mfld_pb_remove), | 118 | .remove = __devexit_p(mfld_pb_remove), |
119 | }; | 119 | }; |
120 | 120 | ||
121 | static int __init mfld_pb_init(void) | 121 | module_platform_driver(mfld_pb_driver); |
122 | { | ||
123 | return platform_driver_register(&mfld_pb_driver); | ||
124 | } | ||
125 | module_init(mfld_pb_init); | ||
126 | |||
127 | static void __exit mfld_pb_exit(void) | ||
128 | { | ||
129 | platform_driver_unregister(&mfld_pb_driver); | ||
130 | } | ||
131 | module_exit(mfld_pb_exit); | ||
132 | 122 | ||
133 | MODULE_AUTHOR("Hong Liu <hong.liu@intel.com>"); | 123 | MODULE_AUTHOR("Hong Liu <hong.liu@intel.com>"); |
134 | MODULE_DESCRIPTION("Intel Medfield Power Button Driver"); | 124 | MODULE_DESCRIPTION("Intel Medfield Power Button Driver"); |
diff --git a/drivers/platform/x86/intel_mid_thermal.c b/drivers/platform/x86/intel_mid_thermal.c index ccd7b1f83519..e4cc99209ff1 100644 --- a/drivers/platform/x86/intel_mid_thermal.c +++ b/drivers/platform/x86/intel_mid_thermal.c | |||
@@ -565,18 +565,7 @@ static struct platform_driver mid_thermal_driver = { | |||
565 | .id_table = therm_id_table, | 565 | .id_table = therm_id_table, |
566 | }; | 566 | }; |
567 | 567 | ||
568 | static int __init mid_thermal_module_init(void) | 568 | module_platform_driver(mid_thermal_driver); |
569 | { | ||
570 | return platform_driver_register(&mid_thermal_driver); | ||
571 | } | ||
572 | |||
573 | static void __exit mid_thermal_module_exit(void) | ||
574 | { | ||
575 | platform_driver_unregister(&mid_thermal_driver); | ||
576 | } | ||
577 | |||
578 | module_init(mid_thermal_module_init); | ||
579 | module_exit(mid_thermal_module_exit); | ||
580 | 569 | ||
581 | MODULE_AUTHOR("Durgadoss R <durgadoss.r@intel.com>"); | 570 | MODULE_AUTHOR("Durgadoss R <durgadoss.r@intel.com>"); |
582 | MODULE_DESCRIPTION("Intel Medfield Platform Thermal Driver"); | 571 | MODULE_DESCRIPTION("Intel Medfield Platform Thermal Driver"); |
diff --git a/drivers/platform/x86/xo1-rfkill.c b/drivers/platform/x86/xo1-rfkill.c index e549eeeda121..41781ed8301c 100644 --- a/drivers/platform/x86/xo1-rfkill.c +++ b/drivers/platform/x86/xo1-rfkill.c | |||
@@ -67,19 +67,8 @@ static struct platform_driver xo1_rfkill_driver = { | |||
67 | .remove = __devexit_p(xo1_rfkill_remove), | 67 | .remove = __devexit_p(xo1_rfkill_remove), |
68 | }; | 68 | }; |
69 | 69 | ||
70 | static int __init xo1_rfkill_init(void) | 70 | module_platform_driver(xo1_rfkill_driver); |
71 | { | ||
72 | return platform_driver_register(&xo1_rfkill_driver); | ||
73 | } | ||
74 | |||
75 | static void __exit xo1_rfkill_exit(void) | ||
76 | { | ||
77 | platform_driver_unregister(&xo1_rfkill_driver); | ||
78 | } | ||
79 | 71 | ||
80 | MODULE_AUTHOR("Daniel Drake <dsd@laptop.org>"); | 72 | MODULE_AUTHOR("Daniel Drake <dsd@laptop.org>"); |
81 | MODULE_LICENSE("GPL"); | 73 | MODULE_LICENSE("GPL"); |
82 | MODULE_ALIAS("platform:xo1-rfkill"); | 74 | MODULE_ALIAS("platform:xo1-rfkill"); |
83 | |||
84 | module_init(xo1_rfkill_init); | ||
85 | module_exit(xo1_rfkill_exit); | ||