Skip to contentSkip to conversation

i2c: convert drivers/i2c/* to use module_platform_driver()

PATCH In review Axel Lin 6 participants 9 messages Nov 27, 2011 – Jan 7, 2012

Subsystems (11)
PowerPC I2C subsystem host drivers Arm/Microchip (AT91) SoC support Arm/Zynq architecture +7 more subsystems
lore
Share & tools
lore

Axel Lin

author
#0 lore raw

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

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

Cc Jean Delvare <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Jochen Friedrich <[email protected]>
Cc Peter Korsgaard <jacmet-OfajU3CKLf1/[email protected]>
Cc Wolfram Sang <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc Manuel Lauss <manuel.lauss-gM/[email protected]>
Cc Barry Song <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Yong Zhang <[email protected]>
Cc Lucas De Marchi <[email protected]>
Cc Grant Likely <grant.likely-s3s/[email protected]>
Cc Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/[email protected]>
Signed-off-by Axel Lin <[email protected]>
---
 drivers/i2c/busses/i2c-at91.c         |   17 ++---------------
 drivers/i2c/busses/i2c-au1550.c       |   13 +------------
 drivers/i2c/busses/i2c-cpm.c          |   13 +------------
 drivers/i2c/busses/i2c-highlander.c   |   13 +------------
 drivers/i2c/busses/i2c-ibm_iic.c      |   13 +------------
 drivers/i2c/busses/i2c-iop3xx.c       |   16 +---------------
 drivers/i2c/busses/i2c-isch.c         |   13 +------------
 drivers/i2c/busses/i2c-ixp2000.c      |   13 +------------
 drivers/i2c/busses/i2c-mpc.c          |   13 +------------
 drivers/i2c/busses/i2c-mv64xxx.c      |   15 +--------------
 drivers/i2c/busses/i2c-ocores.c       |   17 ++---------------
 drivers/i2c/busses/i2c-octeon.c       |   16 +---------------
 drivers/i2c/busses/i2c-pca-platform.c |   14 +-------------
 drivers/i2c/busses/i2c-pmcmsp.c       |   17 ++---------------
 drivers/i2c/busses/i2c-powermac.c     |   19 ++-----------------
 drivers/i2c/busses/i2c-puv3.c         |   16 ++--------------
 drivers/i2c/busses/i2c-sh7760.c       |   13 +------------
 drivers/i2c/busses/i2c-simtec.c       |   20 ++------------------
 drivers/i2c/busses/i2c-xiic.c         |   18 ++----------------
 drivers/i2c/muxes/gpio-i2cmux.c       |   13 +------------
 20 files changed, 27 insertions(+), 275 deletions(-)
drivers/i2c/busses/i2c-at91.c +2 -15
index 305c075..1679dee 100644
@@ -295,9 +295,6 @@ static int at91_i2c_resume(struct platform_device *pdev)
 #define at91_i2c_resume		NULL
 #endif
 
-/* work with "modprobe at91_i2c" from hotplugging or coldplugging */
-MODULE_ALIAS("platform:at91_i2c");
-
 static struct platform_driver at91_i2c_driver = {
 	.probe		= at91_i2c_probe,
 	.remove		= __devexit_p(at91_i2c_remove),

@@ -309,19 +306,9 @@ static struct platform_driver at91_i2c_driver = {
 	},
 };
 
-static int __init at91_i2c_init(void)
-{
-	return platform_driver_register(&at91_i2c_driver);
-}
-
-static void __exit at91_i2c_exit(void)
-{
-	platform_driver_unregister(&at91_i2c_driver);
-}
-
-module_init(at91_i2c_init);
-module_exit(at91_i2c_exit);
+module_platform_driver(at91_i2c_driver);
 
 MODULE_AUTHOR("Rick Bronson");
 MODULE_DESCRIPTION("I2C (TWI) driver for Atmel AT91");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:at91_i2c");
drivers/i2c/busses/i2c-au1550.c +1 -12
index f314d7f..582d616 100644
@@ -426,20 +426,9 @@ static struct platform_driver au1xpsc_smbus_driver = {
 	.remove		= __devexit_p(i2c_au1550_remove),
 };
 
-static int __init i2c_au1550_init(void)
-{
-	return platform_driver_register(&au1xpsc_smbus_driver);
-}
-
-static void __exit i2c_au1550_exit(void)
-{
-	platform_driver_unregister(&au1xpsc_smbus_driver);
-}
+module_platform_driver(au1xpsc_smbus_driver);
 
 MODULE_AUTHOR("Dan Malek, Embedded Edge, LLC.");
 MODULE_DESCRIPTION("SMBus adapter Alchemy pb1550");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("platform:au1xpsc_smbus");
-
-module_init (i2c_au1550_init);
-module_exit (i2c_au1550_exit);
drivers/i2c/busses/i2c-cpm.c +1 -12
index b1d9cd2..c1e1096 100644
@@ -724,18 +724,7 @@ static struct platform_driver cpm_i2c_driver = {
 	},
 };
 
-static int __init cpm_i2c_init(void)
-{
-	return platform_driver_register(&cpm_i2c_driver);
-}
-
-static void __exit cpm_i2c_exit(void)
-{
-	platform_driver_unregister(&cpm_i2c_driver);
-}
-
-module_init(cpm_i2c_init);
-module_exit(cpm_i2c_exit);
+module_platform_driver(cpm_i2c_driver);
 
 MODULE_AUTHOR("Jochen Friedrich <[email protected]>");
 MODULE_DESCRIPTION("I2C-Bus adapter routines for CPM boards");
drivers/i2c/busses/i2c-highlander.c +1 -12
index 63bb1cc..2294dea 100644
@@ -468,18 +468,7 @@ static struct platform_driver highlander_i2c_driver = {
 	.remove		= __devexit_p(highlander_i2c_remove),
 };
 
-static int __init highlander_i2c_init(void)
-{
-	return platform_driver_register(&highlander_i2c_driver);
-}
-
-static void __exit highlander_i2c_exit(void)
-{
-	platform_driver_unregister(&highlander_i2c_driver);
-}
-
-module_init(highlander_i2c_init);
-module_exit(highlander_i2c_exit);
+module_platform_driver(highlander_i2c_driver);
 
 MODULE_AUTHOR("Paul Mundt");
 MODULE_DESCRIPTION("Renesas Highlander FPGA I2C/SMBus adapter");
drivers/i2c/busses/i2c-ibm_iic.c +1 -12
index 3c110fb..dacc545 100644
@@ -815,15 +815,4 @@ static struct platform_driver ibm_iic_driver = {
 	.remove	= __devexit_p(iic_remove),
 };
 
-static int __init iic_init(void)
-{
-	return platform_driver_register(&ibm_iic_driver);
-}
-
-static void __exit iic_exit(void)
-{
-	platform_driver_unregister(&ibm_iic_driver);
-}
-
-module_init(iic_init);
-module_exit(iic_exit);
+module_platform_driver(ibm_iic_driver);
drivers/i2c/busses/i2c-iop3xx.c +1 -15
index f09c931..93f147a 100644
@@ -523,21 +523,7 @@ static struct platform_driver iop3xx_i2c_driver = {
 	},
 };
 
-static int __init 
-i2c_iop3xx_init (void)
-{
-	return platform_driver_register(&iop3xx_i2c_driver);
-}
-
-static void __exit 
-i2c_iop3xx_exit (void)
-{
-	platform_driver_unregister(&iop3xx_i2c_driver);
-	return;
-}
-
-module_init (i2c_iop3xx_init);
-module_exit (i2c_iop3xx_exit);
+module_platform_driver(iop3xx_i2c_driver);
 
 MODULE_AUTHOR("D-TACQ Solutions Ltd <www.d-tacq.com>");
 MODULE_DESCRIPTION("IOP3xx iic algorithm and driver");
drivers/i2c/busses/i2c-isch.c +1 -12
index 0682f8f..6561d27 100644
@@ -306,20 +306,9 @@ static struct platform_driver smbus_sch_driver = {
 	.remove		= __devexit_p(smbus_sch_remove),
 };
 
-static int __init i2c_sch_init(void)
-{
-	return platform_driver_register(&smbus_sch_driver);
-}
-
-static void __exit i2c_sch_exit(void)
-{
-	platform_driver_unregister(&smbus_sch_driver);
-}
+module_platform_driver(smbus_sch_driver);
 
 MODULE_AUTHOR("Jacob Pan <[email protected]>");
 MODULE_DESCRIPTION("Intel SCH SMBus driver");
 MODULE_LICENSE("GPL");
-
-module_init(i2c_sch_init);
-module_exit(i2c_sch_exit);
 MODULE_ALIAS("platform:isch_smbus");
drivers/i2c/busses/i2c-ixp2000.c +1 -12
index c01e951..5d263f90 100644
@@ -148,18 +148,7 @@ static struct platform_driver ixp2000_i2c_driver = {
 	},
 };
 
-static int __init ixp2000_i2c_init(void)
-{
-	return platform_driver_register(&ixp2000_i2c_driver);
-}
-
-static void __exit ixp2000_i2c_exit(void)
-{
-	platform_driver_unregister(&ixp2000_i2c_driver);
-}
-
-module_init(ixp2000_i2c_init);
-module_exit(ixp2000_i2c_exit);
+module_platform_driver(ixp2000_i2c_driver);
 
 MODULE_AUTHOR ("Deepak Saxena <[email protected]>");
 MODULE_DESCRIPTION("IXP2000 GPIO-based I2C bus driver");
drivers/i2c/busses/i2c-mpc.c +1 -12
index 107397a..a8ebb84 100644
@@ -715,18 +715,7 @@ static struct platform_driver mpc_i2c_driver = {
 	},
 };
 
-static int __init fsl_i2c_init(void)
-{
-	return platform_driver_register(&mpc_i2c_driver);
-}
-
-static void __exit fsl_i2c_exit(void)
-{
-	platform_driver_unregister(&mpc_i2c_driver);
-}
-
-module_init(fsl_i2c_init);
-module_exit(fsl_i2c_exit);
+module_platform_driver(mpc_i2c_driver);
 
 MODULE_AUTHOR("Adrian Cox <[email protected]>");
 MODULE_DESCRIPTION("I2C-Bus adapter for MPC107 bridge and "
drivers/i2c/busses/i2c-mv64xxx.c +1 -14
index a9941c6..4f44a33 100644
@@ -611,20 +611,7 @@ static struct platform_driver mv64xxx_i2c_driver = {
 	},
 };
 
-static int __init
-mv64xxx_i2c_init(void)
-{
-	return platform_driver_register(&mv64xxx_i2c_driver);
-}
-
-static void __exit
-mv64xxx_i2c_exit(void)
-{
-	platform_driver_unregister(&mv64xxx_i2c_driver);
-}
-
-module_init(mv64xxx_i2c_init);
-module_exit(mv64xxx_i2c_exit);
+module_platform_driver(mv64xxx_i2c_driver);
 
 MODULE_AUTHOR("Mark A. Greer <[email protected]>");
 MODULE_DESCRIPTION("Marvell mv64xxx host bridge i2c ctlr driver");
drivers/i2c/busses/i2c-ocores.c +2 -15
index 1b46a9d..18068de 100644
@@ -394,9 +394,6 @@ static struct of_device_id ocores_i2c_match[] = {
 };
 MODULE_DEVICE_TABLE(of, ocores_i2c_match);
 
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:ocores-i2c");
-
 static struct platform_driver ocores_i2c_driver = {
 	.probe   = ocores_i2c_probe,
 	.remove  = __devexit_p(ocores_i2c_remove),

@@ -409,19 +406,9 @@ static struct platform_driver ocores_i2c_driver = {
 	},
 };
 
-static int __init ocores_i2c_init(void)
-{
-	return platform_driver_register(&ocores_i2c_driver);
-}
-
-static void __exit ocores_i2c_exit(void)
-{
-	platform_driver_unregister(&ocores_i2c_driver);
-}
-
-module_init(ocores_i2c_init);
-module_exit(ocores_i2c_exit);
+module_platform_driver(ocores_i2c_driver);
 
 MODULE_AUTHOR("Peter Korsgaard <jacmet-OfajU3CKLf1/[email protected]>");
 MODULE_DESCRIPTION("OpenCores I2C bus driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:ocores-i2c");
drivers/i2c/busses/i2c-octeon.c +1 -15
index 56dbe54..ee139a5 100644
@@ -629,24 +629,10 @@ static struct platform_driver octeon_i2c_driver = {
 	},
 };
 
-static int __init octeon_i2c_init(void)
-{
-	int rv;
-
-	rv = platform_driver_register(&octeon_i2c_driver);
-	return rv;
-}
-
-static void __exit octeon_i2c_exit(void)
-{
-	platform_driver_unregister(&octeon_i2c_driver);
-}
+module_platform_driver(octeon_i2c_driver);
 
 MODULE_AUTHOR("Michael Lawnick <[email protected]>");
 MODULE_DESCRIPTION("I2C-Bus adapter for Cavium OCTEON processors");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
 MODULE_ALIAS("platform:" DRV_NAME);
-
-module_init(octeon_i2c_init);
-module_exit(octeon_i2c_exit);
drivers/i2c/busses/i2c-pca-platform.c +1 -13
index ace6799..2adbf1a 100644
@@ -286,20 +286,8 @@ static struct platform_driver i2c_pca_pf_driver = {
 	},
 };
 
-static int __init i2c_pca_pf_init(void)
-{
-	return platform_driver_register(&i2c_pca_pf_driver);
-}
-
-static void __exit i2c_pca_pf_exit(void)
-{
-	platform_driver_unregister(&i2c_pca_pf_driver);
-}
+module_platform_driver(i2c_pca_pf_driver);
 
 MODULE_AUTHOR("Wolfram Sang <[email protected]>");
 MODULE_DESCRIPTION("I2C-PCA9564/PCA9665 platform driver");
 MODULE_LICENSE("GPL");
-
-module_init(i2c_pca_pf_init);
-module_exit(i2c_pca_pf_exit);
-
drivers/i2c/busses/i2c-pmcmsp.c +2 -15
index 127051b..07b7447 100644
@@ -627,9 +627,6 @@ static struct i2c_adapter pmcmsptwi_adapter = {
 	.name		= DRV_NAME,
 };
 
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:" DRV_NAME);
-
 static struct platform_driver pmcmsptwi_driver = {
 	.probe  = pmcmsptwi_probe,
 	.remove	= __devexit_p(pmcmsptwi_remove),

@@ -639,18 +636,8 @@ static struct platform_driver pmcmsptwi_driver = {
 	},
 };
 
-static int __init pmcmsptwi_init(void)
-{
-	return platform_driver_register(&pmcmsptwi_driver);
-}
-
-static void __exit pmcmsptwi_exit(void)
-{
-	platform_driver_unregister(&pmcmsptwi_driver);
-}
+module_platform_driver(pmcmsptwi_driver);
 
 MODULE_DESCRIPTION("PMC MSP TWI/SMBus/I2C driver");
 MODULE_LICENSE("GPL");
-
-module_init(pmcmsptwi_init);
-module_exit(pmcmsptwi_exit);
+MODULE_ALIAS("platform:" DRV_NAME);
drivers/i2c/busses/i2c-powermac.c +2 -17
index b289ec9..7b397c6 100644
@@ -312,10 +312,6 @@ static int __devinit i2c_powermac_probe(struct platform_device *dev)
 	return rc;
 }
 
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:i2c-powermac");
-
 static struct platform_driver i2c_powermac_driver = {
 	.probe = i2c_powermac_probe,
 	.remove = __devexit_p(i2c_powermac_remove),

@@ -325,17 +321,6 @@ static struct platform_driver i2c_powermac_driver = {
 	},
 };
 
-static int __init i2c_powermac_init(void)
-{
-	platform_driver_register(&i2c_powermac_driver);
-	return 0;
-}
+module_platform_driver(i2c_powermac_driver);
 
-
-static void __exit i2c_powermac_cleanup(void)
-{
-	platform_driver_unregister(&i2c_powermac_driver);
-}
-
-module_init(i2c_powermac_init);
-module_exit(i2c_powermac_cleanup);
+MODULE_ALIAS("platform:i2c-powermac");
drivers/i2c/busses/i2c-puv3.c +2 -14
index fac6739..93709fb 100644
@@ -276,8 +276,6 @@ static int puv3_i2c_resume(struct platform_device *dev)
 #define puv3_i2c_resume NULL
 #endif
 
-MODULE_ALIAS("platform:puv3_i2c");
-
 static struct platform_driver puv3_i2c_driver = {
 	.probe		= puv3_i2c_probe,
 	.remove		= __devexit_p(puv3_i2c_remove),

@@ -289,18 +287,8 @@ static struct platform_driver puv3_i2c_driver = {
 	}
 };
 
-static int __init puv3_i2c_init(void)
-{
-	return platform_driver_register(&puv3_i2c_driver);
-}
-
-static void __exit puv3_i2c_exit(void)
-{
-	platform_driver_unregister(&puv3_i2c_driver);
-}
-
-module_init(puv3_i2c_init);
-module_exit(puv3_i2c_exit);
+module_platform_driver(puv3_i2c_driver);
 
 MODULE_DESCRIPTION("PKUnity v3 I2C driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:puv3_i2c");
drivers/i2c/busses/i2c-sh7760.c +1 -12
index a67132b..c0c9dff 100644
@@ -560,18 +560,7 @@ static struct platform_driver sh7760_i2c_drv = {
 	.remove		= __devexit_p(sh7760_i2c_remove),
 };
 
-static int __init sh7760_i2c_init(void)
-{
-	return platform_driver_register(&sh7760_i2c_drv);
-}
-
-static void __exit sh7760_i2c_exit(void)
-{
-	platform_driver_unregister(&sh7760_i2c_drv);
-}
-
-module_init(sh7760_i2c_init);
-module_exit(sh7760_i2c_exit);
+module_platform_driver(sh7760_i2c_drv);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SH7760 I2C bus driver");
drivers/i2c/busses/i2c-simtec.c +2 -18
index 2fc08fb..0846483 100644
@@ -156,12 +156,6 @@ static int simtec_i2c_remove(struct platform_device *dev)
 	return 0;
 }
 
-
-/* device driver */
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:simtec-i2c");
-
 static struct platform_driver simtec_i2c_driver = {
 	.driver		= {
 		.name		= "simtec-i2c",

@@ -171,19 +165,9 @@ static struct platform_driver simtec_i2c_driver = {
 	.remove		= simtec_i2c_remove,
 };
 
-static int __init i2c_adap_simtec_init(void)
-{
-	return platform_driver_register(&simtec_i2c_driver);
-}
-
-static void __exit i2c_adap_simtec_exit(void)
-{
-	platform_driver_unregister(&simtec_i2c_driver);
-}
-
-module_init(i2c_adap_simtec_init);
-module_exit(i2c_adap_simtec_exit);
+module_platform_driver(simtec_i2c_driver);
 
 MODULE_DESCRIPTION("Simtec Generic I2C Bus driver");
 MODULE_AUTHOR("Ben Dooks <ben-Y5A6D6n0/[email protected]>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:simtec-i2c");
drivers/i2c/busses/i2c-xiic.c +2 -16
index 4bb68f3..a5e267f 100644
@@ -795,10 +795,6 @@ static int __devexit xiic_i2c_remove(struct platform_device* pdev)
 	return 0;
 }
 
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:"DRIVER_NAME);
-
 static struct platform_driver xiic_i2c_driver = {
 	.probe   = xiic_i2c_probe,
 	.remove  = __devexit_p(xiic_i2c_remove),

@@ -808,19 +804,9 @@ static struct platform_driver xiic_i2c_driver = {
 	},
 };
 
-static int __init xiic_i2c_init(void)
-{
-	return platform_driver_register(&xiic_i2c_driver);
-}
-
-static void __exit xiic_i2c_exit(void)
-{
-	platform_driver_unregister(&xiic_i2c_driver);
-}
-
-module_init(xiic_i2c_init);
-module_exit(xiic_i2c_exit);
+module_platform_driver(xiic_i2c_driver);
 
 MODULE_AUTHOR("[email protected]");
 MODULE_DESCRIPTION("Xilinx I2C bus driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:"DRIVER_NAME);
drivers/i2c/muxes/gpio-i2cmux.c +1 -12
index 7b6ce62..e5fa695 100644
@@ -165,18 +165,7 @@ static struct platform_driver gpiomux_driver = {
 	},
 };
 
-static int __init gpiomux_init(void)
-{
-	return platform_driver_register(&gpiomux_driver);
-}
-
-static void __exit gpiomux_exit(void)
-{
-	platform_driver_unregister(&gpiomux_driver);
-}
-
-module_init(gpiomux_init);
-module_exit(gpiomux_exit);
+module_platform_driver(gpiomux_driver);
 
 MODULE_DESCRIPTION("GPIO-based I2C multiplexer driver");
 MODULE_AUTHOR("Peter Korsgaard <peter.korsgaard-ob4gmnvZ1/[email protected]>");
Signature · 1 line
1.7.5.4
Acked-by on v1 1/1
#1 lore raw
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Axel" == Axel Lin <[email protected]> writes:

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

Axel> Cc: Jean Delvare <[email protected]> Axel> Cc: Ben Dooks <[email protected]> Axel> Cc: Jochen Friedrich <[email protected]> Axel> Cc: Peter Korsgaard <jacmet-OfajU3CKLf1/[email protected]> Axel> Cc: Wolfram Sang <[email protected]> Axel> Cc: Guan Xuetao <[email protected]> Axel> Cc: Manuel Lauss <manuel.lauss-gM/[email protected]> Axel> Cc: Barry Song <[email protected]> Axel> Cc: Linus Walleij <[email protected]> Axel> Cc: Yong Zhang <[email protected]> Axel> Cc: Lucas De Marchi <[email protected]> Axel> Cc: Grant Likely <grant.likely-s3s/[email protected]> Axel> Cc: Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/[email protected]> Axel> Signed-off-by: Axel Lin <[email protected]>

Looks good for i2c-ocores / gpio-i2cmux:

Acked-by Peter Korsgaard <jacmet-OfajU3CKLf1/[email protected]>
Signature · 1 line
Bye, Peter Korsgaard
Acked-by on v1 1/1
#2 lore raw
In reply to Axel Lin
Quoted 3 lines · Axel Lin

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

Acked-by Wolfram Sang <[email protected]>
Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#4 lore raw
In reply to Axel Lin

Hi Axel,

Quoted 32 lines · Axel Lin

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

Cc Jean Delvare <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Jochen Friedrich <[email protected]>
Cc Peter Korsgaard <jacmet-OfajU3CKLf1/[email protected]>
Cc Wolfram Sang <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc Manuel Lauss <manuel.lauss-gM/[email protected]>
Cc Barry Song <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Yong Zhang <[email protected]>
Cc Lucas De Marchi <[email protected]>
Cc Grant Likely <grant.likely-s3s/[email protected]>
Cc Samuel Ortiz <sameo-VuQAYsv1563Yd54FQh9/[email protected]>
Signed-off-by Axel Lin <[email protected]>
---
 drivers/i2c/busses/i2c-at91.c         |   17 ++---------------
 drivers/i2c/busses/i2c-au1550.c       |   13 +------------
 drivers/i2c/busses/i2c-cpm.c          |   13 +------------
 drivers/i2c/busses/i2c-highlander.c   |   13 +------------
 drivers/i2c/busses/i2c-ibm_iic.c      |   13 +------------
 drivers/i2c/busses/i2c-iop3xx.c       |   16 +---------------
 drivers/i2c/busses/i2c-isch.c         |   13 +------------
 drivers/i2c/busses/i2c-ixp2000.c      |   13 +------------
 drivers/i2c/busses/i2c-mpc.c          |   13 +------------
 drivers/i2c/busses/i2c-mv64xxx.c      |   15 +--------------
 drivers/i2c/busses/i2c-ocores.c       |   17 ++---------------
 drivers/i2c/busses/i2c-octeon.c       |   16 +---------------
 drivers/i2c/busses/i2c-pca-platform.c |   14 +-------------
Quoted 8 lines
 drivers/i2c/busses/i2c-pmcmsp.c       |   17 ++---------------
 drivers/i2c/busses/i2c-powermac.c     |   19 ++-----------------
 drivers/i2c/busses/i2c-puv3.c         |   16 ++--------------
 drivers/i2c/busses/i2c-sh7760.c       |   13 +------------
 drivers/i2c/busses/i2c-simtec.c       |   20 ++------------------
 drivers/i2c/busses/i2c-xiic.c         |   18 ++----------------
 drivers/i2c/muxes/gpio-i2cmux.c       |   13 +------------
 20 files changed, 27 insertions(+), 275 deletions(-)

Looks overall good. I'd rather let Ben apply it as most affected drivers are for embedded platforms.

Just two minor comments:

drivers/i2c/busses/i2c-simtec.c static int simtec_i2c_remove(struct platform_device *dev) · line 160

Quoted 8 lines
drivers/i2c/busses/i2c-simtec.c +0 -2
@@ -156,12 +156,6 @@ static int simtec_i2c_remove(struct platform_device *dev)
 	return 0;
 }
 
-
-/* device driver */

I see no good reason for removing that comment.

Quoted 42 lines
drivers/i2c/busses/i2c-simtec.c +2 -16
-
-/* work with hotplug and coldplug */
-MODULE_ALIAS("platform:simtec-i2c");
-
 static struct platform_driver simtec_i2c_driver = {
 	.driver		= {
 		.name		= "simtec-i2c",

@@ -171,19 +165,9 @@ static struct platform_driver simtec_i2c_driver = {
 	.remove		= simtec_i2c_remove,
 };
 
-static int __init i2c_adap_simtec_init(void)
-{
-	return platform_driver_register(&simtec_i2c_driver);
-}
-
-static void __exit i2c_adap_simtec_exit(void)
-{
-	platform_driver_unregister(&simtec_i2c_driver);
-}
-
-module_init(i2c_adap_simtec_init);
-module_exit(i2c_adap_simtec_exit);
+module_platform_driver(simtec_i2c_driver);
 
 MODULE_DESCRIPTION("Simtec Generic I2C Bus driver");
 MODULE_AUTHOR("Ben Dooks <ben-Y5A6D6n0/[email protected]>");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:simtec-i2c");
 
(...)
drivers/i2c/muxes/gpio-i2cmux.c +0 -3
index 7b6ce62..e5fa695 100644
@@ -165,18 +165,7 @@ static struct platform_driver gpiomux_driver = {
 	},
 };
 
-static int __init gpiomux_init(void)
-{
-	return platform_driver_register(&gpiomux_driver);

drivers/i2c/muxes/gpio-i2cmux.c static struct platform_driver gpiomux_driver = { · line 168

Quoted 10 lines
drivers/i2c/muxes/gpio-i2cmux.c +1 -9
-}
-
-static void __exit gpiomux_exit(void)
-{
-	platform_driver_unregister(&gpiomux_driver);
-}
-
-module_init(gpiomux_init);
-module_exit(gpiomux_exit);
+module_platform_driver(gpiomux_driver);

This one would be better as a separate patch, as it touches a different subdirectory, which I am responsible for.

Signature · 1 line
Jean Delvare
#5 lore raw
Quoted 7 lines

drivers/i2c/muxes/gpio-i2cmux.c static struct platform_driver gpiomux_driver = { · line 168

Quoted 4 lines
drivers/i2c/muxes/gpio-i2cmux.c +1 -2
-module_init(gpiomux_init);
-module_exit(gpiomux_exit);
+module_platform_driver(gpiomux_driver);

This one would be better as a separate patch, as it touches a different subdirectory, which I am responsible for.

... which has a patch pending[1], hint ;)

[1] http://comments.gmane.org/gmane.linux.drivers.i2c/9432

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
#6 lore raw
Quoted 11 lines · Wolfram Sang
Quoted 7 lines

drivers/i2c/muxes/gpio-i2cmux.c static struct platform_driver gpiomux_driver = { · line 168

Quoted 4 lines
drivers/i2c/muxes/gpio-i2cmux.c +1 -2
-module_init(gpiomux_init);
-module_exit(gpiomux_exit);
+module_platform_driver(gpiomux_driver);

This one would be better as a separate patch, as it touches a different subdirectory, which I am responsible for.

... which has a patch pending[1], hint ;)

[1] http://comments.gmane.org/gmane.linux.drivers.i2c/9432

Yes, that's one of the reasons why I think a separate patch would be more appropriate. It might be difficult to avoid patch collisions otherwise.

Signature · 1 line
Jean Delvare
#7 lore raw
In reply to Jean Delvare

Axel,

Quoted 9 lines · Jean Delvare
Quoted 8 lines · Axel Lin
drivers/i2c/muxes/gpio-i2cmux.c +0 -0
index 7b6ce62..e5fa695 100644
@@ -165,18 +165,7 @@ static struct platform_driver gpiomux_driver = {
 	},
 };
Quoted 16 lines

drivers/i2c/muxes/gpio-i2cmux.c static struct platform_driver gpiomux_driver = { · line 168

Quoted 13 lines
drivers/i2c/muxes/gpio-i2cmux.c +1 -12
-static int __init gpiomux_init(void)
-{
-	return platform_driver_register(&gpiomux_driver);
-}
-
-static void __exit gpiomux_exit(void)
-{
-	platform_driver_unregister(&gpiomux_driver);
-}
-
-module_init(gpiomux_init);
-module_exit(gpiomux_exit);
+module_platform_driver(gpiomux_driver);

This one would be better as a separate patch, as it touches a different subdirectory, which I am responsible for.

You resent a v2 of the patch without muxes/gpio-i2cmux.c, which is good, but I never received the suggested separate patch for muxes/gpio-i2cmux.c. Did I miss it somehow? Please send it quickly if you want it to make it into kernel 3.3.

Signature · 1 line
Jean Delvare
Acked-by on v1 1/1
#8 lore raw
In reply to Axel Lin
Quoted 18 lines · Axel Lin

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

Cc Jean Delvare <[email protected]>
Cc Ben Dooks <[email protected]>
Cc Jochen Friedrich <[email protected]>
Cc Peter Korsgaard <[email protected]>
Cc Wolfram Sang <[email protected]>
Cc Guan Xuetao <[email protected]>
Cc Manuel Lauss <[email protected]>
Cc Barry Song <[email protected]>
Cc Linus Walleij <[email protected]>
Cc Yong Zhang <[email protected]>
Cc Lucas De Marchi <[email protected]>
Cc Grant Likely <[email protected]>
Cc Samuel Ortiz <[email protected]>
Signed-off-by Axel Lin <[email protected]>
Quoted 1 line

---

For i2c-puv3.c,

Acked-by Guan Xuetao <[email protected]>

Thanks,

Guan Xuetao