[PATCH 0/8 net-next] irda: use module_driver in a new helper

[PATCH 0/8 net-next] irda: use module_driver in a new helper

[Fabian Frederick]

Currently a lot of irda drivers use generic init/exit functions.
This small patchset adds a module_sirdev_driver() macro
calling module_driver() which implicitely generates init/exit
functions returning register/unregister().

This results in a lot of code removal.

(See include/linux/device.h/module_driver() for further details).

Note: compiled but untested.

Fabian Frederick (8):
  irda: sir-dev: add module_sirdev_driver() helper
  irda: actl200l-sir: use module_sirdev_driver() helper
  irda: mcp2120-sir: use module_sirdev_driver() helper
  irda: esi-sir: use module_sirdev_driver() helper
  irda: girbil-sir: use module_sirdev_driver() helper
  irda: old_belkin-sir: use module_sirdev_driver() helper
  irda: litelink-sir: use module_sirdev_driver() helper
  irda: ma600-sir: use module_sirdev_driver() helper

 drivers/net/irda/act200l-sir.c    | 15 ++-------------
 drivers/net/irda/esi-sir.c        | 16 ++--------------
 drivers/net/irda/girbil-sir.c     | 15 ++-------------
 drivers/net/irda/litelink-sir.c   | 28 ++--------------------------
 drivers/net/irda/ma600-sir.c      | 17 ++---------------
 drivers/net/irda/mcp2120-sir.c    | 15 ++-------------
 drivers/net/irda/old_belkin-sir.c | 15 ++-------------
 drivers/net/irda/sir-dev.h        |  7 +++++++
 8 files changed, 21 insertions(+), 107 deletions(-)

-- 
2.8.1

[PATCH 1/8 net-next] irda: sir-dev: add module_sirdev_driver() helper

[Fabian Frederick]

Based on module_driver() to avoid generic functions.
See include/linux/device.h/module_driver comments for
further details.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/sir-dev.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/irda/sir-dev.h b/drivers/net/irda/sir-dev.h
index f50b9c1..894c781 100644
--- a/drivers/net/irda/sir-dev.h
+++ b/drivers/net/irda/sir-dev.h
@@ -99,6 +99,13 @@ struct sir_driver {
 	int (*stop_dev)(struct sir_dev *dev);
 };
 
+/* module_sirdev_driver() - Helper macro for drivers that don't do
+ * anything special in module init/exit.
+ * See include/linux/device.h for further details.
+ */
+#define module_sirdev_driver(__sirdev_driver) \
+	module_driver(__sirdev_driver, irda_register_dongle, \
+			irda_unregister_dongle)
 
 /* exported */
 
-- 
2.8.1

[PATCH 2/8 net-next] irda: actl200l-sir: use module_sirdev_driver() helper

[Fabian Frederick]

Avoid using generic init/exit functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/act200l-sir.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/net/irda/act200l-sir.c b/drivers/net/irda/act200l-sir.c
index e891751..bb58c6e 100644
--- a/drivers/net/irda/act200l-sir.c
+++ b/drivers/net/irda/act200l-sir.c
@@ -93,16 +93,6 @@ static struct dongle_driver act200l = {
 	.set_speed	= act200l_change_speed,
 };
 
-static int __init act200l_sir_init(void)
-{
-	return irda_register_dongle(&act200l);
-}
-
-static void __exit act200l_sir_cleanup(void)
-{
-	irda_unregister_dongle(&act200l);
-}
-
 static int act200l_open(struct sir_dev *dev)
 {
 	struct qos_info *qos = &dev->qos;
@@ -241,10 +231,9 @@ static int act200l_reset(struct sir_dev *dev)
 	return (delay > 0) ? delay : ret;
 }
 
+module_sirdev_driver(act200l);
+
 MODULE_AUTHOR("SHIMIZU Takuya <tshimizu@ga2.so-net.ne.jp>");
 MODULE_DESCRIPTION("ACTiSYS ACT-IR200L dongle driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-10"); /* IRDA_ACT200L_DONGLE */
-
-module_init(act200l_sir_init);
-module_exit(act200l_sir_cleanup);
-- 
2.8.1

[PATCH 3/8 net-next] irda: mcp2120-sir: use module_sirdev_driver() helper

[Fabian Frederick]

Avoid using generic init/exit functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/mcp2120-sir.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/net/irda/mcp2120-sir.c b/drivers/net/irda/mcp2120-sir.c
index 2e33f91..015d434 100644
--- a/drivers/net/irda/mcp2120-sir.c
+++ b/drivers/net/irda/mcp2120-sir.c
@@ -49,16 +49,6 @@ static struct dongle_driver mcp2120 = {
 	.set_speed	= mcp2120_change_speed,
 };
 
-static int __init mcp2120_sir_init(void)
-{
-	return irda_register_dongle(&mcp2120);
-}
-
-static void __exit mcp2120_sir_cleanup(void)
-{
-	irda_unregister_dongle(&mcp2120);
-}
-
 static int mcp2120_open(struct sir_dev *dev)
 {
 	struct qos_info *qos = &dev->qos;
@@ -215,10 +205,9 @@ static int mcp2120_reset(struct sir_dev *dev)
 	return (delay > 0) ? delay : ret;
 }
 
+module_sirdev_driver(mcp2120);
+
 MODULE_AUTHOR("Felix Tang <tangf@eyetap.org>");
 MODULE_DESCRIPTION("Microchip MCP2120");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-9"); /* IRDA_MCP2120_DONGLE */
-
-module_init(mcp2120_sir_init);
-module_exit(mcp2120_sir_cleanup);
-- 
2.8.1

[PATCH 4/8 net-next] irda: esi-sir: use module_sirdev_driver() helper

[Fabian Frederick]

Avoid using generic init/exit functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/esi-sir.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/net/irda/esi-sir.c b/drivers/net/irda/esi-sir.c
index 019a3e8..65470e4 100644
--- a/drivers/net/irda/esi-sir.c
+++ b/drivers/net/irda/esi-sir.c
@@ -52,16 +52,6 @@ static struct dongle_driver esi = {
 	.set_speed	= esi_change_speed,
 };
 
-static int __init esi_sir_init(void)
-{
-	return irda_register_dongle(&esi);
-}
-
-static void __exit esi_sir_cleanup(void)
-{
-	irda_unregister_dongle(&esi);
-}
-
 static int esi_open(struct sir_dev *dev)
 {
 	struct qos_info *qos = &dev->qos;
@@ -147,11 +137,9 @@ static int esi_reset(struct sir_dev *dev)
 	return 0;
 }
 
+module_sirdev_driver(esi);
+
 MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");
 MODULE_DESCRIPTION("Extended Systems JetEye PC dongle driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-1"); /* IRDA_ESI_DONGLE */
-
-module_init(esi_sir_init);
-module_exit(esi_sir_cleanup);
-
-- 
2.8.1

[PATCH 5/8 net-next] irda: girbil-sir: use module_sirdev_driver() helper

[Fabian Frederick]

Avoid using generic init/exit functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/girbil-sir.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/net/irda/girbil-sir.c b/drivers/net/irda/girbil-sir.c
index 7e0a5b8..a0bc4ac 100644
--- a/drivers/net/irda/girbil-sir.c
+++ b/drivers/net/irda/girbil-sir.c
@@ -72,16 +72,6 @@ static struct dongle_driver girbil = {
 	.set_speed	= girbil_change_speed,
 };
 
-static int __init girbil_sir_init(void)
-{
-	return irda_register_dongle(&girbil);
-}
-
-static void __exit girbil_sir_cleanup(void)
-{
-	irda_unregister_dongle(&girbil);
-}
-
 static int girbil_open(struct sir_dev *dev)
 {
 	struct qos_info *qos = &dev->qos;
@@ -243,10 +233,9 @@ static int girbil_reset(struct sir_dev *dev)
 	return (delay > 0) ? delay : ret;
 }
 
+module_sirdev_driver(girbil);
+
 MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");
 MODULE_DESCRIPTION("Greenwich GIrBIL dongle driver");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-4"); /* IRDA_GIRBIL_DONGLE */
-
-module_init(girbil_sir_init);
-module_exit(girbil_sir_cleanup);
-- 
2.8.1

[PATCH 6/8 net-next] irda: old_belkin-sir: use module_sirdev_driver() helper

[Fabian Frederick]

Avoid using generic init/exit functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/old_belkin-sir.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/drivers/net/irda/old_belkin-sir.c b/drivers/net/irda/old_belkin-sir.c
index a7c2e99..b15157c 100644
--- a/drivers/net/irda/old_belkin-sir.c
+++ b/drivers/net/irda/old_belkin-sir.c
@@ -76,16 +76,6 @@ static struct dongle_driver old_belkin = {
 	.set_speed	= old_belkin_change_speed,
 };
 
-static int __init old_belkin_sir_init(void)
-{
-	return irda_register_dongle(&old_belkin);
-}
-
-static void __exit old_belkin_sir_cleanup(void)
-{
-	irda_unregister_dongle(&old_belkin);
-}
-
 static int old_belkin_open(struct sir_dev *dev)
 {
 	struct qos_info *qos = &dev->qos;
@@ -137,10 +127,9 @@ static int old_belkin_reset(struct sir_dev *dev)
 	return 0;
 }
 
+module_sirdev_driver(old_belkin);
+
 MODULE_AUTHOR("Jean Tourrilhes <jt@hpl.hp.com>");
 MODULE_DESCRIPTION("Belkin (old) SmartBeam dongle driver");	
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-7"); /* IRDA_OLD_BELKIN_DONGLE */
-
-module_init(old_belkin_sir_init);
-module_exit(old_belkin_sir_cleanup);
-- 
2.8.1

[PATCH 7/8 net-next] irda: litelink-sir: use module_sirdev_driver() helper

[Fabian Frederick]

Avoid using generic init/exit functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/litelink-sir.c | 28 ++--------------------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/drivers/net/irda/litelink-sir.c b/drivers/net/irda/litelink-sir.c
index 8eefcb4..541fe7c 100644
--- a/drivers/net/irda/litelink-sir.c
+++ b/drivers/net/irda/litelink-sir.c
@@ -62,16 +62,6 @@ static struct dongle_driver litelink = {
 	.set_speed	= litelink_change_speed,
 };
 
-static int __init litelink_sir_init(void)
-{
-	return irda_register_dongle(&litelink);
-}
-
-static void __exit litelink_sir_cleanup(void)
-{
-	irda_unregister_dongle(&litelink);
-}
-
 static int litelink_open(struct sir_dev *dev)
 {
 	struct qos_info *qos = &dev->qos;
@@ -177,23 +167,9 @@ static int litelink_reset(struct sir_dev *dev)
 	return 0;
 }
 
+module_sirdev_driver(litelink);
+
 MODULE_AUTHOR("Dag Brattli <dagb@cs.uit.no>");
 MODULE_DESCRIPTION("Parallax Litelink dongle driver");	
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-5"); /* IRDA_LITELINK_DONGLE */
-
-/*
- * Function init_module (void)
- *
- *    Initialize Litelink module
- *
- */
-module_init(litelink_sir_init);
-
-/*
- * Function cleanup_module (void)
- *
- *    Cleanup Litelink module
- *
- */
-module_exit(litelink_sir_cleanup);
-- 
2.8.1

[PATCH 8/8 net-next] irda: ma600-sir: use module_sirdev_driver() helper

[Fabian Frederick]

Avoid using generic init/empty functions.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/irda/ma600-sir.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/drivers/net/irda/ma600-sir.c b/drivers/net/irda/ma600-sir.c
index a764817..a8c4c29 100644
--- a/drivers/net/irda/ma600-sir.c
+++ b/drivers/net/irda/ma600-sir.c
@@ -62,17 +62,6 @@ static struct dongle_driver ma600 = {
 	.set_speed      = ma600_change_speed,
 };
 
-
-static int __init ma600_sir_init(void)
-{
-	return irda_register_dongle(&ma600);
-}
-
-static void __exit ma600_sir_cleanup(void)
-{
-	irda_unregister_dongle(&ma600);
-}
-
 /*
 	Power on:
 		(0) Clear RTS and DTR for 1 second
@@ -243,11 +232,9 @@ static int ma600_reset(struct sir_dev *dev)
 	return 0;
 }
 
+module_sirdev_driver(ma600);
+
 MODULE_AUTHOR("Leung <95Etwl@alumni.ee.ust.hk> http://www.engsvr.ust/~eetwl95");
 MODULE_DESCRIPTION("MA600 dongle driver version 0.1");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("irda-dongle-11"); /* IRDA_MA600_DONGLE */
-		
-module_init(ma600_sir_init);
-module_exit(ma600_sir_cleanup);
-
-- 
2.8.1