[PATCH 4/5] staging:iio: Use module_i2c_driver to register I2C drivers

2011-11-16 Thread Lars-Peter Clausen 
Use the newly introduced module_i2c_driver macro for registering I2C drivers.
This allows us to remove a few lines of boilerplate code.

Signed-off-by: Lars-Peter Clausen l...@metafoo.de
---
 drivers/staging/iio/adc/ad7291.c|   14 +-
 drivers/staging/iio/adc/ad799x_core.c   |   14 +-
 drivers/staging/iio/adc/adt7410.c   |   14 +-
 drivers/staging/iio/adc/max1363_core.c  |   14 +-
 drivers/staging/iio/addac/adt7316-i2c.c |   14 +-
 drivers/staging/iio/cdc/ad7150.c|   14 +-
 drivers/staging/iio/cdc/ad7152.c|   14 +-
 drivers/staging/iio/cdc/ad7746.c|   14 +-
 drivers/staging/iio/dac/max517.c|   14 +-
 drivers/staging/iio/impedance-analyzer/ad5933.c |   13 +
 drivers/staging/iio/light/isl29018.c|   14 +-
 drivers/staging/iio/light/tsl2563.c |   14 +-
 drivers/staging/iio/light/tsl2583.c |   14 +-
 drivers/staging/iio/magnetometer/ak8975.c   |   14 +-
 drivers/staging/iio/magnetometer/hmc5843.c  |   14 +-
 drivers/staging/iio/meter/ade7854-i2c.c |   14 +-
 16 files changed, 16 insertions(+), 207 deletions(-)

diff --git a/drivers/staging/iio/adc/ad7291.c b/drivers/staging/iio/adc/ad7291.c
index 10e79e8..aa44a52 100644
--- a/drivers/staging/iio/adc/ad7291.c
+++ b/drivers/staging/iio/adc/ad7291.c
@@ -700,20 +700,8 @@ static struct i2c_driver ad7291_driver = {
.remove = __devexit_p(ad7291_remove),
.id_table = ad7291_id,
 };
-
-static __init int ad7291_init(void)
-{
-   return i2c_add_driver(ad7291_driver);
-}
-
-static __exit void ad7291_exit(void)
-{
-   i2c_del_driver(ad7291_driver);
-}
+module_i2c_driver(ad7291_driver);
 
 MODULE_AUTHOR(Sonic Zhang sonic.zh...@analog.com);
 MODULE_DESCRIPTION(Analog Devices AD7291 ADC driver);
 MODULE_LICENSE(GPL v2);
-
-module_init(ad7291_init);
-module_exit(ad7291_exit);
diff --git a/drivers/staging/iio/adc/ad799x_core.c 
b/drivers/staging/iio/adc/ad799x_core.c
index ee6cd79..c0d2f88 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -929,21 +929,9 @@ static struct i2c_driver ad799x_driver = {
.remove = __devexit_p(ad799x_remove),
.id_table = ad799x_id,
 };
-
-static __init int ad799x_init(void)
-{
-   return i2c_add_driver(ad799x_driver);
-}
-
-static __exit void ad799x_exit(void)
-{
-   i2c_del_driver(ad799x_driver);
-}
+module_i2c_driver(ad799x_driver);
 
 MODULE_AUTHOR(Michael Hennerich henner...@blackfin.uclinux.org);
 MODULE_DESCRIPTION(Analog Devices AD799x ADC);
 MODULE_LICENSE(GPL v2);
 MODULE_ALIAS(i2c:ad799x);
-
-module_init(ad799x_init);
-module_exit(ad799x_exit);
diff --git a/drivers/staging/iio/adc/adt7410.c 
b/drivers/staging/iio/adc/adt7410.c
index a289e42..3481cf6 100644
--- a/drivers/staging/iio/adc/adt7410.c
+++ b/drivers/staging/iio/adc/adt7410.c
@@ -844,21 +844,9 @@ static struct i2c_driver adt7410_driver = {
.remove = __devexit_p(adt7410_remove),
.id_table = adt7410_id,
 };
-
-static __init int adt7410_init(void)
-{
-   return i2c_add_driver(adt7410_driver);
-}
-
-static __exit void adt7410_exit(void)
-{
-   i2c_del_driver(adt7410_driver);
-}
+module_i2c_driver(adt7410_driver);
 
 MODULE_AUTHOR(Sonic Zhang sonic.zh...@analog.com);
 MODULE_DESCRIPTION(Analog Devices ADT7410 digital
 temperature sensor driver);
 MODULE_LICENSE(GPL v2);
-
-module_init(adt7410_init);
-module_exit(adt7410_exit);
diff --git a/drivers/staging/iio/adc/max1363_core.c 
b/drivers/staging/iio/adc/max1363_core.c
index eb699ad..3f28f1a 100644
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -1410,20 +1410,8 @@ static struct i2c_driver max1363_driver = {
.remove = max1363_remove,
.id_table = max1363_id,
 };
-
-static __init int max1363_init(void)
-{
-   return i2c_add_driver(max1363_driver);
-}
-
-static __exit void max1363_exit(void)
-{
-   i2c_del_driver(max1363_driver);
-}
+module_i2c_driver(max1363_driver);
 
 MODULE_AUTHOR(Jonathan Cameron ji...@cam.ac.uk);
 MODULE_DESCRIPTION(Maxim 1363 ADC);
 MODULE_LICENSE(GPL v2);
-
-module_init(max1363_init);
-module_exit(max1363_exit);
diff --git a/drivers/staging/iio/addac/adt7316-i2c.c 
b/drivers/staging/iio/addac/adt7316-i2c.c
index 07d718e..2c03a39 100644
--- a/drivers/staging/iio/addac/adt7316-i2c.c
+++ b/drivers/staging/iio/addac/adt7316-i2c.c
@@ -151,21 +151,9 @@ static struct i2c_driver adt7316_driver = {
.resume = adt7316_i2c_resume,
.id_table = adt7316_i2c_id,
 };
-
-static __init int adt7316_i2c_init(void)
-{
-   return i2c_add_driver(adt7316_driver);
-}
-
-static __exit void adt7316_i2c_exit(void)
-{
-   i2c_del_driver(adt7316_driver);
-}

Re: [PATCH 4/5] staging:iio: Use module_i2c_driver to register I2C drivers

2011-11-16 Thread Jonathan Cameron 
On 11/16/2011 09:13 AM, Lars-Peter Clausen wrote:
 Use the newly introduced module_i2c_driver macro for registering I2C drivers.
 This allows us to remove a few lines of boilerplate code.
 
 Signed-off-by: Lars-Peter Clausen l...@metafoo.de
Acked-by: Jonathan Cameron ji...@kernel.org
 ---
  drivers/staging/iio/adc/ad7291.c|   14 +-
  drivers/staging/iio/adc/ad799x_core.c   |   14 +-
  drivers/staging/iio/adc/adt7410.c   |   14 +-
  drivers/staging/iio/adc/max1363_core.c  |   14 +-
  drivers/staging/iio/addac/adt7316-i2c.c |   14 +-
  drivers/staging/iio/cdc/ad7150.c|   14 +-
  drivers/staging/iio/cdc/ad7152.c|   14 +-
  drivers/staging/iio/cdc/ad7746.c|   14 +-
  drivers/staging/iio/dac/max517.c|   14 +-
  drivers/staging/iio/impedance-analyzer/ad5933.c |   13 +
  drivers/staging/iio/light/isl29018.c|   14 +-
  drivers/staging/iio/light/tsl2563.c |   14 +-
  drivers/staging/iio/light/tsl2583.c |   14 +-
  drivers/staging/iio/magnetometer/ak8975.c   |   14 +-
  drivers/staging/iio/magnetometer/hmc5843.c  |   14 +-
  drivers/staging/iio/meter/ade7854-i2c.c |   14 +-
  16 files changed, 16 insertions(+), 207 deletions(-)
 
 diff --git a/drivers/staging/iio/adc/ad7291.c 
 b/drivers/staging/iio/adc/ad7291.c
 index 10e79e8..aa44a52 100644
 --- a/drivers/staging/iio/adc/ad7291.c
 +++ b/drivers/staging/iio/adc/ad7291.c
 @@ -700,20 +700,8 @@ static struct i2c_driver ad7291_driver = {
   .remove = __devexit_p(ad7291_remove),
   .id_table = ad7291_id,
  };
 -
 -static __init int ad7291_init(void)
 -{
 - return i2c_add_driver(ad7291_driver);
 -}
 -
 -static __exit void ad7291_exit(void)
 -{
 - i2c_del_driver(ad7291_driver);
 -}
 +module_i2c_driver(ad7291_driver);
  
  MODULE_AUTHOR(Sonic Zhang sonic.zh...@analog.com);
  MODULE_DESCRIPTION(Analog Devices AD7291 ADC driver);
  MODULE_LICENSE(GPL v2);
 -
 -module_init(ad7291_init);
 -module_exit(ad7291_exit);
 diff --git a/drivers/staging/iio/adc/ad799x_core.c 
 b/drivers/staging/iio/adc/ad799x_core.c
 index ee6cd79..c0d2f88 100644
 --- a/drivers/staging/iio/adc/ad799x_core.c
 +++ b/drivers/staging/iio/adc/ad799x_core.c
 @@ -929,21 +929,9 @@ static struct i2c_driver ad799x_driver = {
   .remove = __devexit_p(ad799x_remove),
   .id_table = ad799x_id,
  };
 -
 -static __init int ad799x_init(void)
 -{
 - return i2c_add_driver(ad799x_driver);
 -}
 -
 -static __exit void ad799x_exit(void)
 -{
 - i2c_del_driver(ad799x_driver);
 -}
 +module_i2c_driver(ad799x_driver);
  
  MODULE_AUTHOR(Michael Hennerich henner...@blackfin.uclinux.org);
  MODULE_DESCRIPTION(Analog Devices AD799x ADC);
  MODULE_LICENSE(GPL v2);
  MODULE_ALIAS(i2c:ad799x);
 -
 -module_init(ad799x_init);
 -module_exit(ad799x_exit);
 diff --git a/drivers/staging/iio/adc/adt7410.c 
 b/drivers/staging/iio/adc/adt7410.c
 index a289e42..3481cf6 100644
 --- a/drivers/staging/iio/adc/adt7410.c
 +++ b/drivers/staging/iio/adc/adt7410.c
 @@ -844,21 +844,9 @@ static struct i2c_driver adt7410_driver = {
   .remove = __devexit_p(adt7410_remove),
   .id_table = adt7410_id,
  };
 -
 -static __init int adt7410_init(void)
 -{
 - return i2c_add_driver(adt7410_driver);
 -}
 -
 -static __exit void adt7410_exit(void)
 -{
 - i2c_del_driver(adt7410_driver);
 -}
 +module_i2c_driver(adt7410_driver);
  
  MODULE_AUTHOR(Sonic Zhang sonic.zh...@analog.com);
  MODULE_DESCRIPTION(Analog Devices ADT7410 digital
temperature sensor driver);
  MODULE_LICENSE(GPL v2);
 -
 -module_init(adt7410_init);
 -module_exit(adt7410_exit);
 diff --git a/drivers/staging/iio/adc/max1363_core.c 
 b/drivers/staging/iio/adc/max1363_core.c
 index eb699ad..3f28f1a 100644
 --- a/drivers/staging/iio/adc/max1363_core.c
 +++ b/drivers/staging/iio/adc/max1363_core.c
 @@ -1410,20 +1410,8 @@ static struct i2c_driver max1363_driver = {
   .remove = max1363_remove,
   .id_table = max1363_id,
  };
 -
 -static __init int max1363_init(void)
 -{
 - return i2c_add_driver(max1363_driver);
 -}
 -
 -static __exit void max1363_exit(void)
 -{
 - i2c_del_driver(max1363_driver);
 -}
 +module_i2c_driver(max1363_driver);
  
  MODULE_AUTHOR(Jonathan Cameron ji...@cam.ac.uk);
  MODULE_DESCRIPTION(Maxim 1363 ADC);
  MODULE_LICENSE(GPL v2);
 -
 -module_init(max1363_init);
 -module_exit(max1363_exit);
 diff --git a/drivers/staging/iio/addac/adt7316-i2c.c 
 b/drivers/staging/iio/addac/adt7316-i2c.c
 index 07d718e..2c03a39 100644
 --- a/drivers/staging/iio/addac/adt7316-i2c.c
 +++ b/drivers/staging/iio/addac/adt7316-i2c.c
 @@ -151,21 +151,9 @@ static struct i2c_driver adt7316_driver = {
   .resume = adt7316_i2c_resume,
   .id_table = adt7316_i2c_id,