Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Input: misc - use macro module_platform_driver()

Commit 940ab88962bc1aff3273a8356d64577a6e386736 introduced a new macro to
save some platform_driver boilerplate code. Use it.

Signed-off-by: JJ Ding <dgdunix@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

authored by

JJ Ding and committed by
Dmitry Torokhov
840a746b 5146c84f

+21 -247
+1 -12
drivers/input/misc/88pm860x_onkey.c
··· 137 137 .probe = pm860x_onkey_probe, 138 138 .remove = __devexit_p(pm860x_onkey_remove), 139 139 }; 140 - 141 - static int __init pm860x_onkey_init(void) 142 - { 143 - return platform_driver_register(&pm860x_onkey_driver); 144 - } 145 - module_init(pm860x_onkey_init); 146 - 147 - static void __exit pm860x_onkey_exit(void) 148 - { 149 - platform_driver_unregister(&pm860x_onkey_driver); 150 - } 151 - module_exit(pm860x_onkey_exit); 140 + module_platform_driver(pm860x_onkey_driver); 152 141 153 142 MODULE_DESCRIPTION("Marvell 88PM860x ONKEY driver"); 154 143 MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+1 -12
drivers/input/misc/ab8500-ponkey.c
··· 139 139 .probe = ab8500_ponkey_probe, 140 140 .remove = __devexit_p(ab8500_ponkey_remove), 141 141 }; 142 - 143 - static int __init ab8500_ponkey_init(void) 144 - { 145 - return platform_driver_register(&ab8500_ponkey_driver); 146 - } 147 - module_init(ab8500_ponkey_init); 148 - 149 - static void __exit ab8500_ponkey_exit(void) 150 - { 151 - platform_driver_unregister(&ab8500_ponkey_driver); 152 - } 153 - module_exit(ab8500_ponkey_exit); 142 + module_platform_driver(ab8500_ponkey_driver); 154 143 155 144 MODULE_LICENSE("GPL v2"); 156 145 MODULE_AUTHOR("Sundar Iyer <sundar.iyer@stericsson.com>");
+1 -12
drivers/input/misc/bfin_rotary.c
··· 264 264 #endif 265 265 }, 266 266 }; 267 - 268 - static int __init bfin_rotary_init(void) 269 - { 270 - return platform_driver_register(&bfin_rotary_device_driver); 271 - } 272 - module_init(bfin_rotary_init); 273 - 274 - static void __exit bfin_rotary_exit(void) 275 - { 276 - platform_driver_unregister(&bfin_rotary_device_driver); 277 - } 278 - module_exit(bfin_rotary_exit); 267 + module_platform_driver(bfin_rotary_device_driver); 279 268 280 269 MODULE_LICENSE("GPL"); 281 270 MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
+1 -13
drivers/input/misc/cobalt_btns.c
··· 163 163 .owner = THIS_MODULE, 164 164 }, 165 165 }; 166 - 167 - static int __init cobalt_buttons_init(void) 168 - { 169 - return platform_driver_register(&cobalt_buttons_driver); 170 - } 171 - 172 - static void __exit cobalt_buttons_exit(void) 173 - { 174 - platform_driver_unregister(&cobalt_buttons_driver); 175 - } 176 - 177 - module_init(cobalt_buttons_init); 178 - module_exit(cobalt_buttons_exit); 166 + module_platform_driver(cobalt_buttons_driver);
+1 -12
drivers/input/misc/dm355evm_keys.c
··· 267 267 .name = "dm355evm_keys", 268 268 }, 269 269 }; 270 - 271 - static int __init dm355evm_keys_init(void) 272 - { 273 - return platform_driver_register(&dm355evm_keys_driver); 274 - } 275 - module_init(dm355evm_keys_init); 276 - 277 - static void __exit dm355evm_keys_exit(void) 278 - { 279 - platform_driver_unregister(&dm355evm_keys_driver); 280 - } 281 - module_exit(dm355evm_keys_exit); 270 + module_platform_driver(dm355evm_keys_driver); 282 271 283 272 MODULE_LICENSE("GPL");
+1 -12
drivers/input/misc/ixp4xx-beeper.c
··· 168 168 .remove = __devexit_p(ixp4xx_spkr_remove), 169 169 .shutdown = ixp4xx_spkr_shutdown, 170 170 }; 171 + module_platform_driver(ixp4xx_spkr_platform_driver); 171 172 172 - static int __init ixp4xx_spkr_init(void) 173 - { 174 - return platform_driver_register(&ixp4xx_spkr_platform_driver); 175 - } 176 - 177 - static void __exit ixp4xx_spkr_exit(void) 178 - { 179 - platform_driver_unregister(&ixp4xx_spkr_platform_driver); 180 - } 181 - 182 - module_init(ixp4xx_spkr_init); 183 - module_exit(ixp4xx_spkr_exit);
+1 -12
drivers/input/misc/max8925_onkey.c
··· 166 166 .probe = max8925_onkey_probe, 167 167 .remove = __devexit_p(max8925_onkey_remove), 168 168 }; 169 - 170 - static int __init max8925_onkey_init(void) 171 - { 172 - return platform_driver_register(&max8925_onkey_driver); 173 - } 174 - module_init(max8925_onkey_init); 175 - 176 - static void __exit max8925_onkey_exit(void) 177 - { 178 - platform_driver_unregister(&max8925_onkey_driver); 179 - } 180 - module_exit(max8925_onkey_exit); 169 + module_platform_driver(max8925_onkey_driver); 181 170 182 171 MODULE_DESCRIPTION("Maxim MAX8925 ONKEY driver"); 183 172 MODULE_AUTHOR("Haojian Zhuang <haojian.zhuang@marvell.com>");
+1 -13
drivers/input/misc/pcap_keys.c
··· 125 125 .owner = THIS_MODULE, 126 126 } 127 127 }; 128 - 129 - static int __init pcap_keys_init(void) 130 - { 131 - return platform_driver_register(&pcap_keys_device_driver); 132 - }; 133 - 134 - static void __exit pcap_keys_exit(void) 135 - { 136 - platform_driver_unregister(&pcap_keys_device_driver); 137 - }; 138 - 139 - module_init(pcap_keys_init); 140 - module_exit(pcap_keys_exit); 128 + module_platform_driver(pcap_keys_device_driver); 141 129 142 130 MODULE_DESCRIPTION("Motorola PCAP2 input events driver"); 143 131 MODULE_AUTHOR("Ilya Petrov <ilya.muromec@gmail.com>");
+1 -12
drivers/input/misc/pcf50633-input.c
··· 113 113 .probe = pcf50633_input_probe, 114 114 .remove = __devexit_p(pcf50633_input_remove), 115 115 }; 116 - 117 - static int __init pcf50633_input_init(void) 118 - { 119 - return platform_driver_register(&pcf50633_input_driver); 120 - } 121 - module_init(pcf50633_input_init); 122 - 123 - static void __exit pcf50633_input_exit(void) 124 - { 125 - platform_driver_unregister(&pcf50633_input_driver); 126 - } 127 - module_exit(pcf50633_input_exit); 116 + module_platform_driver(pcf50633_input_driver); 128 117 129 118 MODULE_AUTHOR("Balaji Rao <balajirrao@openmoko.org>"); 130 119 MODULE_DESCRIPTION("PCF50633 input driver");
+1 -13
drivers/input/misc/pcspkr.c
··· 134 134 .remove = __devexit_p(pcspkr_remove), 135 135 .shutdown = pcspkr_shutdown, 136 136 }; 137 + module_platform_driver(pcspkr_platform_driver); 137 138 138 - 139 - static int __init pcspkr_init(void) 140 - { 141 - return platform_driver_register(&pcspkr_platform_driver); 142 - } 143 - 144 - static void __exit pcspkr_exit(void) 145 - { 146 - platform_driver_unregister(&pcspkr_platform_driver); 147 - } 148 - 149 - module_init(pcspkr_init); 150 - module_exit(pcspkr_exit);
+1 -12
drivers/input/misc/pm8xxx-vibrator.c
··· 277 277 .pm = &pm8xxx_vib_pm_ops, 278 278 }, 279 279 }; 280 - 281 - static int __init pm8xxx_vib_init(void) 282 - { 283 - return platform_driver_register(&pm8xxx_vib_driver); 284 - } 285 - module_init(pm8xxx_vib_init); 286 - 287 - static void __exit pm8xxx_vib_exit(void) 288 - { 289 - platform_driver_unregister(&pm8xxx_vib_driver); 290 - } 291 - module_exit(pm8xxx_vib_exit); 280 + module_platform_driver(pm8xxx_vib_driver); 292 281 293 282 MODULE_ALIAS("platform:pm8xxx_vib"); 294 283 MODULE_DESCRIPTION("PMIC8xxx vibrator driver based on ff-memless framework");
+1 -12
drivers/input/misc/pmic8xxx-pwrkey.c
··· 213 213 .pm = &pm8xxx_pwr_key_pm_ops, 214 214 }, 215 215 }; 216 - 217 - static int __init pmic8xxx_pwrkey_init(void) 218 - { 219 - return platform_driver_register(&pmic8xxx_pwrkey_driver); 220 - } 221 - module_init(pmic8xxx_pwrkey_init); 222 - 223 - static void __exit pmic8xxx_pwrkey_exit(void) 224 - { 225 - platform_driver_unregister(&pmic8xxx_pwrkey_driver); 226 - } 227 - module_exit(pmic8xxx_pwrkey_exit); 216 + module_platform_driver(pmic8xxx_pwrkey_driver); 228 217 229 218 MODULE_ALIAS("platform:pmic8xxx_pwrkey"); 230 219 MODULE_DESCRIPTION("PMIC8XXX Power Key driver");
+1 -12
drivers/input/misc/pwm-beeper.c
··· 180 180 .pm = PWM_BEEPER_PM_OPS, 181 181 }, 182 182 }; 183 - 184 - static int __init pwm_beeper_init(void) 185 - { 186 - return platform_driver_register(&pwm_beeper_driver); 187 - } 188 - module_init(pwm_beeper_init); 189 - 190 - static void __exit pwm_beeper_exit(void) 191 - { 192 - platform_driver_unregister(&pwm_beeper_driver); 193 - } 194 - module_exit(pwm_beeper_exit); 183 + module_platform_driver(pwm_beeper_driver); 195 184 196 185 MODULE_AUTHOR("Lars-Peter Clausen <lars@metafoo.de>"); 197 186 MODULE_DESCRIPTION("PWM beeper driver");
+1 -13
drivers/input/misc/rb532_button.c
··· 100 100 .owner = THIS_MODULE, 101 101 }, 102 102 }; 103 - 104 - static int __init rb532_button_init(void) 105 - { 106 - return platform_driver_register(&rb532_button_driver); 107 - } 108 - 109 - static void __exit rb532_button_exit(void) 110 - { 111 - platform_driver_unregister(&rb532_button_driver); 112 - } 113 - 114 - module_init(rb532_button_init); 115 - module_exit(rb532_button_exit); 103 + module_platform_driver(rb532_button_driver); 116 104 117 105 MODULE_AUTHOR("Phil Sutter <n0-1@freewrt.org>"); 118 106 MODULE_LICENSE("GPL");
+1 -13
drivers/input/misc/rotary_encoder.c
··· 284 284 .owner = THIS_MODULE, 285 285 } 286 286 }; 287 - 288 - static int __init rotary_encoder_init(void) 289 - { 290 - return platform_driver_register(&rotary_encoder_driver); 291 - } 292 - 293 - static void __exit rotary_encoder_exit(void) 294 - { 295 - platform_driver_unregister(&rotary_encoder_driver); 296 - } 297 - 298 - module_init(rotary_encoder_init); 299 - module_exit(rotary_encoder_exit); 287 + module_platform_driver(rotary_encoder_driver); 300 288 301 289 MODULE_ALIAS("platform:" DRV_NAME); 302 290 MODULE_DESCRIPTION("GPIO rotary encoder driver");
+1 -12
drivers/input/misc/sgi_btns.c
··· 164 164 .owner = THIS_MODULE, 165 165 }, 166 166 }; 167 - 168 - static int __init sgi_buttons_init(void) 169 - { 170 - return platform_driver_register(&sgi_buttons_driver); 171 - } 172 - 173 - static void __exit sgi_buttons_exit(void) 174 - { 175 - platform_driver_unregister(&sgi_buttons_driver); 176 - } 167 + module_platform_driver(sgi_buttons_driver); 177 168 178 169 MODULE_LICENSE("GPL"); 179 - module_init(sgi_buttons_init); 180 - module_exit(sgi_buttons_exit);
+2 -13
drivers/input/misc/twl4030-pwrbutton.c
··· 107 107 } 108 108 109 109 static struct platform_driver twl4030_pwrbutton_driver = { 110 + .probe = twl4030_pwrbutton_probe, 110 111 .remove = __exit_p(twl4030_pwrbutton_remove), 111 112 .driver = { 112 113 .name = "twl4030_pwrbutton", 113 114 .owner = THIS_MODULE, 114 115 }, 115 116 }; 116 - 117 - static int __init twl4030_pwrbutton_init(void) 118 - { 119 - return platform_driver_probe(&twl4030_pwrbutton_driver, 120 - twl4030_pwrbutton_probe); 121 - } 122 - module_init(twl4030_pwrbutton_init); 123 - 124 - static void __exit twl4030_pwrbutton_exit(void) 125 - { 126 - platform_driver_unregister(&twl4030_pwrbutton_driver); 127 - } 128 - module_exit(twl4030_pwrbutton_exit); 117 + module_platform_driver(twl4030_pwrbutton_driver); 129 118 130 119 MODULE_ALIAS("platform:twl4030_pwrbutton"); 131 120 MODULE_DESCRIPTION("Triton2 Power Button");
+1 -13
drivers/input/misc/twl4030-vibra.c
··· 278 278 #endif 279 279 }, 280 280 }; 281 - 282 - static int __init twl4030_vibra_init(void) 283 - { 284 - return platform_driver_register(&twl4030_vibra_driver); 285 - } 286 - module_init(twl4030_vibra_init); 287 - 288 - static void __exit twl4030_vibra_exit(void) 289 - { 290 - platform_driver_unregister(&twl4030_vibra_driver); 291 - } 292 - module_exit(twl4030_vibra_exit); 281 + module_platform_driver(twl4030_vibra_driver); 293 282 294 283 MODULE_ALIAS("platform:twl4030-vibra"); 295 - 296 284 MODULE_DESCRIPTION("TWL4030 Vibra driver"); 297 285 MODULE_LICENSE("GPL"); 298 286 MODULE_AUTHOR("Nokia Corporation");
+1 -12
drivers/input/misc/twl6040-vibra.c
··· 410 410 .pm = &twl6040_vibra_pm_ops, 411 411 }, 412 412 }; 413 - 414 - static int __init twl6040_vibra_init(void) 415 - { 416 - return platform_driver_register(&twl6040_vibra_driver); 417 - } 418 - module_init(twl6040_vibra_init); 419 - 420 - static void __exit twl6040_vibra_exit(void) 421 - { 422 - platform_driver_unregister(&twl6040_vibra_driver); 423 - } 424 - module_exit(twl6040_vibra_exit); 413 + module_platform_driver(twl6040_vibra_driver); 425 414 426 415 MODULE_ALIAS("platform:twl6040-vibra"); 427 416 MODULE_DESCRIPTION("TWL6040 Vibra driver");
+1 -12
drivers/input/misc/wm831x-on.c
··· 145 145 .owner = THIS_MODULE, 146 146 }, 147 147 }; 148 - 149 - static int __init wm831x_on_init(void) 150 - { 151 - return platform_driver_register(&wm831x_on_driver); 152 - } 153 - module_init(wm831x_on_init); 154 - 155 - static void __exit wm831x_on_exit(void) 156 - { 157 - platform_driver_unregister(&wm831x_on_driver); 158 - } 159 - module_exit(wm831x_on_exit); 148 + module_platform_driver(wm831x_on_driver); 160 149 161 150 MODULE_ALIAS("platform:wm831x-on"); 162 151 MODULE_DESCRIPTION("WM831x ON pin");