backlight: convert drivers/video/backlight/* to use module_platform_driver()

PATCH In review Axel Lin 6 participants 6 messages Nov 26, 2011 – Nov 30, 2011

Subsystems (5)

Framebuffer layer Wolfson microelectronics drivers Backlight class/subsystem Dialog semiconductor drivers +1 more subsystems

lore

Share & tools

lore

Axel Lin

author

2011-11-26 02:19 UTC #0 lore raw

PATCH 1/1 backlight: convert drivers/video/backlight/* to use module_platform_driver()

This patch converts the drivers in drivers/video/backlight/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.

Cc Haojian Zhuang <[email protected]>

Cc H Hartley Sweeten <[email protected]>

Cc Mike Rapoport <[email protected]>

Cc Richard Purdie <[email protected]>

Cc Michael Hennerich <[email protected]>

Cc Mark Brown <[email protected]>

Signed-off-by Axel Lin <[email protected]>

---
 drivers/video/backlight/88pm860x_bl.c        |   12 +-----------
 drivers/video/backlight/adp5520_bl.c         |   12 +-----------
 drivers/video/backlight/adx_bl.c             |   13 +------------
 drivers/video/backlight/da903x_bl.c          |   12 +-----------
 drivers/video/backlight/ep93xx_bl.c          |   12 +-----------
 drivers/video/backlight/generic_bl.c         |   13 +------------
 drivers/video/backlight/jornada720_bl.c      |   13 +------------
 drivers/video/backlight/jornada720_lcd.c     |   13 +------------
 drivers/video/backlight/max8925_bl.c         |   12 +-----------
 drivers/video/backlight/omap1_bl.c           |   13 +------------
 drivers/video/backlight/pcf50633-backlight.c |   12 +-----------
 drivers/video/backlight/platform_lcd.c       |   13 +------------
 drivers/video/backlight/pwm_bl.c             |   12 +-----------
 drivers/video/backlight/wm831x_bl.c          |   12 +-----------
 14 files changed, 14 insertions(+), 160 deletions(-)

drivers/video/backlight/88pm860x_bl.c +1 ~~-11~~

index 1105fa1..a1376dc 100644
@@ -270,17 +270,7 @@ static struct platform_driver pm860x_backlight_driver = {
 	.remove		= pm860x_backlight_remove,
 };
 
-static int __init pm860x_backlight_init(void)
-{
-	return platform_driver_register(&pm860x_backlight_driver);
-}
-module_init(pm860x_backlight_init);
-
-static void __exit pm860x_backlight_exit(void)
-{
-	platform_driver_unregister(&pm860x_backlight_driver);
-}
-module_exit(pm860x_backlight_exit);
+module_platform_driver(pm860x_backlight_driver);
 
 MODULE_DESCRIPTION("Backlight Driver for Marvell Semiconductor 88PM8606");
 MODULE_AUTHOR("Haojian Zhuang <[email protected]>");

drivers/video/backlight/adp5520_bl.c +1 ~~-11~~

index dfb763e..2e630bf 100644
@@ -384,17 +384,7 @@ static struct platform_driver adp5520_bl_driver = {
 	.resume		= adp5520_bl_resume,
 };
 
-static int __init adp5520_bl_init(void)
-{
-	return platform_driver_register(&adp5520_bl_driver);
-}
-module_init(adp5520_bl_init);
-
-static void __exit adp5520_bl_exit(void)
-{
-	platform_driver_unregister(&adp5520_bl_driver);
-}
-module_exit(adp5520_bl_exit);
+module_platform_driver(adp5520_bl_driver);
 
 MODULE_AUTHOR("Michael Hennerich <[email protected]>");
 MODULE_DESCRIPTION("ADP5520(01) Backlight Driver");

drivers/video/backlight/adx_bl.c +1 ~~-12~~

index c861c41..a69c61b 100644
@@ -164,18 +164,7 @@ static struct platform_driver adx_backlight_driver = {
 	},
 };
 
-static int __init adx_backlight_init(void)
-{
-	return platform_driver_register(&adx_backlight_driver);
-}
-
-static void __exit adx_backlight_exit(void)
-{
-	platform_driver_unregister(&adx_backlight_driver);
-}
-
-module_init(adx_backlight_init);
-module_exit(adx_backlight_exit);
+module_platform_driver(adx_backlight_driver);
 
 MODULE_AUTHOR("Thierry Reding <[email protected]>");
 MODULE_DESCRIPTION("Avionic Design Xanthos Backlight Driver");

drivers/video/backlight/da903x_bl.c +1 ~~-11~~

index d68f14b..abb4a06 100644
@@ -199,17 +199,7 @@ static struct platform_driver da903x_backlight_driver = {
 	.remove		= da903x_backlight_remove,
 };
 
-static int __init da903x_backlight_init(void)
-{
-	return platform_driver_register(&da903x_backlight_driver);
-}
-module_init(da903x_backlight_init);
-
-static void __exit da903x_backlight_exit(void)
-{
-	platform_driver_unregister(&da903x_backlight_driver);
-}
-module_exit(da903x_backlight_exit);
+module_platform_driver(da903x_backlight_driver);
 
 MODULE_DESCRIPTION("Backlight Driver for Dialog Semiconductor DA9030/DA9034");
 MODULE_AUTHOR("Eric Miao <[email protected]>"

drivers/video/backlight/ep93xx_bl.c +1 ~~-11~~

index c74a6f4..32b9167 100644
@@ -144,17 +144,7 @@ static struct platform_driver ep93xxbl_driver = {
 	.resume		= ep93xxbl_resume,
 };
 
-static int __init ep93xxbl_init(void)
-{
-	return platform_driver_register(&ep93xxbl_driver);
-}
-module_init(ep93xxbl_init);
-
-static void __exit ep93xxbl_exit(void)
-{
-	platform_driver_unregister(&ep93xxbl_driver);
-}
-module_exit(ep93xxbl_exit);
+module_platform_driver(ep93xxbl_driver);
 
 MODULE_DESCRIPTION("EP93xx Backlight Driver");
 MODULE_AUTHOR("H Hartley Sweeten <[email protected]>");

drivers/video/backlight/generic_bl.c +1 ~~-12~~

index adb1914..9ce6170 100644
@@ -132,18 +132,7 @@ static struct platform_driver genericbl_driver = {
 	},
 };
 
-static int __init genericbl_init(void)
-{
-	return platform_driver_register(&genericbl_driver);
-}
-
-static void __exit genericbl_exit(void)
-{
-	platform_driver_unregister(&genericbl_driver);
-}
-
-module_init(genericbl_init);
-module_exit(genericbl_exit);
+module_platform_driver(genericbl_driver);
 
 MODULE_AUTHOR("Richard Purdie <[email protected]>");
 MODULE_DESCRIPTION("Generic Backlight Driver");

drivers/video/backlight/jornada720_bl.c +1 ~~-12~~

index de65d80..2f8af5d 100644
@@ -147,19 +147,8 @@ static struct platform_driver jornada_bl_driver = {
 	},
 };
 
-static int __init jornada_bl_init(void)
-{
-	return platform_driver_register(&jornada_bl_driver);
-}
-
-static void __exit jornada_bl_exit(void)
-{
-	platform_driver_unregister(&jornada_bl_driver);
-}
+module_platform_driver(jornada_bl_driver);
 
 MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 Backlight driver");
 MODULE_LICENSE("GPL");
-
-module_init(jornada_bl_init);
-module_exit(jornada_bl_exit);

drivers/video/backlight/jornada720_lcd.c +1 ~~-12~~

index d2ff658..22d231a 100644
@@ -135,19 +135,8 @@ static struct platform_driver jornada_lcd_driver = {
 	},
 };
 
-static int __init jornada_lcd_init(void)
-{
-	return platform_driver_register(&jornada_lcd_driver);
-}
-
-static void __exit jornada_lcd_exit(void)
-{
-	platform_driver_unregister(&jornada_lcd_driver);
-}
+module_platform_driver(jornada_lcd_driver);
 
 MODULE_AUTHOR("Kristoffer Ericson <[email protected]>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 LCD driver");
 MODULE_LICENSE("GPL");
-
-module_init(jornada_lcd_init);
-module_exit(jornada_lcd_exit);

drivers/video/backlight/max8925_bl.c +1 ~~-11~~

index 7bbc802..c915e3b 100644
@@ -188,17 +188,7 @@ static struct platform_driver max8925_backlight_driver = {
 	.remove		= __devexit_p(max8925_backlight_remove),
 };
 
-static int __init max8925_backlight_init(void)
-{
-	return platform_driver_register(&max8925_backlight_driver);
-}
-module_init(max8925_backlight_init);
-
-static void __exit max8925_backlight_exit(void)
-{
-	platform_driver_unregister(&max8925_backlight_driver);
-};
-module_exit(max8925_backlight_exit);
+module_platform_driver(max8925_backlight_driver);
 
 MODULE_DESCRIPTION("Backlight Driver for Maxim MAX8925");
 MODULE_AUTHOR("Haojian Zhuang <[email protected]>");

drivers/video/backlight/omap1_bl.c +1 ~~-12~~

index 08d26a7..d8cde27 100644
@@ -195,18 +195,7 @@ static struct platform_driver omapbl_driver = {
 	},
 };
 
-static int __init omapbl_init(void)
-{
-	return platform_driver_register(&omapbl_driver);
-}
-
-static void __exit omapbl_exit(void)
-{
-	platform_driver_unregister(&omapbl_driver);
-}
-
-module_init(omapbl_init);
-module_exit(omapbl_exit);
+module_platform_driver(omapbl_driver);
 
 MODULE_AUTHOR("Andrzej Zaborowski <[email protected]>");
 MODULE_DESCRIPTION("OMAP LCD Backlight driver");

drivers/video/backlight/pcf50633-backlight.c +1 ~~-11~~

index ef5628d..13e88b7 100644
@@ -173,17 +173,7 @@ static struct platform_driver pcf50633_bl_driver = {
 	},
 };
 
-static int __init pcf50633_bl_init(void)
-{
-	return platform_driver_register(&pcf50633_bl_driver);
-}
-module_init(pcf50633_bl_init);
-
-static void __exit pcf50633_bl_exit(void)
-{
-	platform_driver_unregister(&pcf50633_bl_driver);
-}
-module_exit(pcf50633_bl_exit);
+module_platform_driver(pcf50633_bl_driver);
 
 MODULE_AUTHOR("Lars-Peter Clausen <[email protected]>");
 MODULE_DESCRIPTION("PCF50633 backlight driver");

drivers/video/backlight/platform_lcd.c +1 ~~-12~~

index 302330ac..187da59 100644
@@ -157,18 +157,7 @@ static struct platform_driver platform_lcd_driver = {
 	.resume         = platform_lcd_resume,
 };
 
-static int __init platform_lcd_init(void)
-{
-	return platform_driver_register(&platform_lcd_driver);
-}
-
-static void __exit platform_lcd_cleanup(void)
-{
-	platform_driver_unregister(&platform_lcd_driver);
-}
-
-module_init(platform_lcd_init);
-module_exit(platform_lcd_cleanup);
+module_platform_driver(platform_lcd_driver);
 
 MODULE_AUTHOR("Ben Dooks <[email protected]>");
 MODULE_LICENSE("GPL v2");

drivers/video/backlight/pwm_bl.c +1 ~~-11~~

index 8b5b2a4..b811e8f 100644
@@ -207,17 +207,7 @@ static struct platform_driver pwm_backlight_driver = {
 	.resume		= pwm_backlight_resume,
 };
 
-static int __init pwm_backlight_init(void)
-{
-	return platform_driver_register(&pwm_backlight_driver);
-}
-module_init(pwm_backlight_init);
-
-static void __exit pwm_backlight_exit(void)
-{
-	platform_driver_unregister(&pwm_backlight_driver);
-}
-module_exit(pwm_backlight_exit);
+module_platform_driver(pwm_backlight_driver);
 
 MODULE_DESCRIPTION("PWM based Backlight Driver");
 MODULE_LICENSE("GPL");

drivers/video/backlight/wm831x_bl.c +1 ~~-11~~

index fbe9e93..4e915f5 100644
@@ -236,17 +236,7 @@ static struct platform_driver wm831x_backlight_driver = {
 	.remove		= wm831x_backlight_remove,
 };
 
-static int __init wm831x_backlight_init(void)
-{
-	return platform_driver_register(&wm831x_backlight_driver);
-}
-module_init(wm831x_backlight_init);
-
-static void __exit wm831x_backlight_exit(void)
-{
-	platform_driver_unregister(&wm831x_backlight_driver);
-}
-module_exit(wm831x_backlight_exit);
+module_platform_driver(wm831x_backlight_driver);
 
 MODULE_DESCRIPTION("Backlight Driver for WM831x PMICs");
 MODULE_AUTHOR("Mark Brown <[email protected]");

Signature · 1 line

1.7.5.4

Haojian Zhuang

2011-11-26 02:59 UTC #1 lore raw

Quoted 26 lines · Axel Lin

This patch converts the drivers in drivers/video/backlight/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.
Cc Haojian Zhuang <[email protected]>
Cc H Hartley Sweeten <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Michael Hennerich <[email protected]>
Cc Mark Brown <[email protected]>
Signed-off-by Axel Lin <[email protected]>
---
drivers/video/backlight/88pm860x_bl.c | 12 +----------- drivers/video/backlight/adp5520_bl.c | 12 +----------- drivers/video/backlight/adx_bl.c | 13 +------------ drivers/video/backlight/da903x_bl.c | 12 +----------- drivers/video/backlight/ep93xx_bl.c | 12 +----------- drivers/video/backlight/generic_bl.c | 13 +------------ drivers/video/backlight/jornada720_bl.c | 13 +------------ drivers/video/backlight/jornada720_lcd.c | 13 +------------ drivers/video/backlight/max8925_bl.c | 12 +----------- drivers/video/backlight/omap1_bl.c | 13 +------------ drivers/video/backlight/pcf50633-backlight.c | 12 +----------- drivers/video/backlight/platform_lcd.c | 13 +------------ drivers/video/backlight/pwm_bl.c | 12 +----------- drivers/video/backlight/wm831x_bl.c | 12 +-----------

Quoted 2 lines

 14 files changed, 14 insertions(+), 160 deletions(-)

Acked-by Haojian Zhuang <[email protected]>

Michael Hennerich

maintainer Acked-by

2011-11-28 07:53 UTC #2 lore raw

Quoted 29 lines · Haojian Zhuang

Quoted 11 lines · Axel Lin
This patch converts the drivers in drivers/video/backlight/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.
Cc Haojian Zhuang<[email protected]>
Cc H Hartley Sweeten<[email protected]>
Cc Mike Rapoport<[email protected]>
Cc Richard Purdie<[email protected]>
Cc Michael Hennerich<[email protected]>
Cc Mark Brown<[email protected]>
Signed-off-by Axel Lin<[email protected]>
Quoted 17 lines
---
  drivers/video/backlight/88pm860x_bl.c        |   12 +-----------
  drivers/video/backlight/adp5520_bl.c         |   12 +-----------
  drivers/video/backlight/adx_bl.c             |   13 +------------
  drivers/video/backlight/da903x_bl.c          |   12 +-----------
  drivers/video/backlight/ep93xx_bl.c          |   12 +-----------
  drivers/video/backlight/generic_bl.c         |   13 +------------
  drivers/video/backlight/jornada720_bl.c      |   13 +------------
  drivers/video/backlight/jornada720_lcd.c     |   13 +------------
  drivers/video/backlight/max8925_bl.c         |   12 +-----------
  drivers/video/backlight/omap1_bl.c           |   13 +------------
  drivers/video/backlight/pcf50633-backlight.c |   12 +-----------
  drivers/video/backlight/platform_lcd.c       |   13 +------------
  drivers/video/backlight/pwm_bl.c             |   12 +-----------
  drivers/video/backlight/wm831x_bl.c          |   12 +-----------
  14 files changed, 14 insertions(+), 160 deletions(-)

Quoted 2 lines

Acked-by Haojian Zhuang<[email protected]>

Acked-by Michael Hennerich <[email protected]>

Signature · 8 lines

Greetings,
Michael

--
Analog Devices GmbH      Wilhelm-Wagenfeld-Str. 6      80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif

Mark Brown

Acked-by on v1 1/1

2011-11-27 11:23 UTC #3 lore raw

In reply to Axel Lin

Quoted 3 lines · Axel Lin

This patch converts the drivers in drivers/video/backlight/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.

Acked-by Mark Brown <[email protected]>

H Hartley Sweeten

Acked-by on v1 1/1

2011-11-28 17:28 UTC #4 lore raw

In reply to Axel Lin

Quoted 12 lines · Axel Lin

This patch converts the drivers in drivers/video/backlight/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.
Cc Haojian Zhuang <[email protected]>
Cc H Hartley Sweeten <[email protected]>
Cc Mike Rapoport <[email protected]>
Cc Richard Purdie <[email protected]>
Cc Michael Hennerich <[email protected]>
Cc Mark Brown <[email protected]>
Signed-off-by Axel Lin <[email protected]>
---

[...]

Quoted 1 line

 drivers/video/backlight/ep93xx_bl.c          |   12 +-----------

[...]

Quoted 13 lines

drivers/video/backlight/ep93xx_bl.c +0 -5

index c74a6f4..32b9167 100644
@@ -144,17 +144,7 @@ static struct platform_driver ep93xxbl_driver = {
 	.resume		= ep93xxbl_resume,
 };
 
-static int __init ep93xxbl_init(void)
-{
-	return platform_driver_register(&ep93xxbl_driver);
-}
-module_init(ep93xxbl_init);

drivers/video/backlight/ep93xx_bl.c static struct platform_driver ep93xxbl_driver = { · line 150

Quoted 10 lines

drivers/video/backlight/ep93xx_bl.c +1 -6

-
-static void __exit ep93xxbl_exit(void)
-{
-	platform_driver_unregister(&ep93xxbl_driver);
-}
-module_exit(ep93xxbl_exit);
+module_platform_driver(ep93xxbl_driver);
 
 MODULE_DESCRIPTION("EP93xx Backlight Driver");
 MODULE_AUTHOR("H Hartley Sweeten <[email protected]>");

For ep93xx_bl.c:

Acked-by H Hartley Sweeten <[email protected]>

��{.n�+��+%��ݶ��w��{.n�+��{��G��{ay�ʇڙ�,j��f��h��z_�(�階�ݢj"��m��G��?��&��~��iO��z��v�^�m��?�I�

Andrew Morton

2011-11-30 20:51 UTC #5 lore raw

In reply to Axel Lin

Quoted 5 lines · On Sat, 26 Nov 2011 10:19:23 +0800 Axel Lin <[email protected]> wrote:

This patch converts the drivers in drivers/video/backlight/* to use the module_platform_driver() macro which makes the code smaller and a bit simpler.
 drivers/video/backlight/adx_bl.c             |   13 +------------

fyi, I dropped the adx_bl.c part due to the pending "backlight: remove ADX backlight device support" which remvoes that file.