---

yaml --- r: 304577 b: refs/heads/master c: 294f930 h: refs/heads/master i: 304575: ee10115 v: v3
git-mirror · May 9, 2012 · 09a5c71 · 09a5c71
1 parent a424abd
commit 09a5c71
Show file tree

Hide file tree

Showing 29 changed files with 64 additions and 373 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: feb5680e063fd39873e9e638937f1197d38a81ca
+refs/heads/master: 294f930d98be86fb4f34302c718a49719650857f
diff --git a/trunk/drivers/staging/comedi/drivers/8255.c b/trunk/drivers/staging/comedi/drivers/8255.c
@@ -437,24 +437,13 @@ static int dev_8255_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_8255 = {
+static struct comedi_driver dev_8255_driver = {
 	.driver_name	= "8255",
 	.module		= THIS_MODULE,
 	.attach		= dev_8255_attach,
 	.detach		= dev_8255_detach,
 };
-
-static int __init driver_8255_init_module(void)
-{
-	return comedi_driver_register(&driver_8255);
-}
-module_init(driver_8255_init_module);
-
-static void __exit driver_8255_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_8255);
-}
-module_exit(driver_8255_cleanup_module);
+module_comedi_driver(dev_8255_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/acl7225b.c b/trunk/drivers/staging/comedi/drivers/acl7225b.c
@@ -134,7 +134,7 @@ static const struct boardtype boardtypes[] = {
 	{ "p16r16dio", P16R16DIO_SIZE, },
 };
 
-static struct comedi_driver driver_acl7225b = {
+static struct comedi_driver acl7225b_driver = {
 	.driver_name	= "acl7225b",
 	.module		= THIS_MODULE,
 	.attach		= acl7225b_attach,
@@ -143,18 +143,7 @@ static struct comedi_driver driver_acl7225b = {
 	.num_names	= ARRAY_SIZE(boardtypes),
 	.offset		= sizeof(struct boardtype),
 };
-
-static int __init driver_acl7225b_init_module(void)
-{
-	return comedi_driver_register(&driver_acl7225b);
-}
-module_init(driver_acl7225b_init_module);
-
-static void __exit driver_acl7225b_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_acl7225b);
-}
-module_exit(driver_acl7225b_cleanup_module);
+module_comedi_driver(acl7225b_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/adq12b.c b/trunk/drivers/staging/comedi/drivers/adq12b.c
@@ -347,7 +347,7 @@ static const struct adq12b_board adq12b_boards[] = {
 	},
 };
 
-static struct comedi_driver driver_adq12b = {
+static struct comedi_driver adq12b_driver = {
 	.driver_name	= "adq12b",
 	.module		= THIS_MODULE,
 	.attach		= adq12b_attach,
@@ -356,18 +356,7 @@ static struct comedi_driver driver_adq12b = {
 	.offset		= sizeof(struct adq12b_board),
 	.num_names	= ARRAY_SIZE(adq12b_boards),
 };
-
-static int __init driver_adq12b_init_module(void)
-{
-	return comedi_driver_register(&driver_adq12b);
-}
-module_init(driver_adq12b_init_module);
-
-static void __exit driver_adq12b_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_adq12b);
-}
-module_exit(driver_adq12b_cleanup_module);
+module_comedi_driver(adq12b_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c b/trunk/drivers/staging/comedi/drivers/aio_aio12_8.c
@@ -217,28 +217,16 @@ static int aio_aio12_8_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_aio_aio12_8 = {
-	.driver_name = "aio_aio12_8",
-	.module = THIS_MODULE,
-	.attach = aio_aio12_8_attach,
-	.detach = aio_aio12_8_detach,
-	.board_name = &board_types[0].name,
-	.num_names = 1,
-	.offset = sizeof(struct aio12_8_boardtype),
+static struct comedi_driver aio_aio12_8_driver = {
+	.driver_name	= "aio_aio12_8",
+	.module		= THIS_MODULE,
+	.attach		= aio_aio12_8_attach,
+	.detach		= aio_aio12_8_detach,
+	.board_name	= &board_types[0].name,
+	.num_names	= ARRAY_SIZE(board_types),
+	.offset		= sizeof(struct aio12_8_boardtype),
 };
-
-static int __init driver_aio_aio12_8_init_module(void)
-{
-	return comedi_driver_register(&driver_aio_aio12_8);
-}
-
-static void __exit driver_aio_aio12_8_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_aio_aio12_8);
-}
-
-module_init(driver_aio_aio12_8_init_module);
-module_exit(driver_aio_aio12_8_cleanup_module);
+module_comedi_driver(aio_aio12_8_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/aio_iiro_16.c b/trunk/drivers/staging/comedi/drivers/aio_iiro_16.c
@@ -159,7 +159,7 @@ static int aio_iiro_16_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_aio_iiro_16 = {
+static struct comedi_driver aio_iiro_16_driver = {
 	.driver_name	= "aio_iiro_16",
 	.module		= THIS_MODULE,
 	.attach		= aio_iiro_16_attach,
@@ -168,18 +168,7 @@ static struct comedi_driver driver_aio_iiro_16 = {
 	.offset		= sizeof(struct aio_iiro_16_board),
 	.num_names	= ARRAY_SIZE(aio_iiro_16_boards),
 };
-
-static int __init driver_aio_iiro_16_init_module(void)
-{
-	return comedi_driver_register(&driver_aio_iiro_16);
-}
-module_init(driver_aio_iiro_16_init_module);
-
-static void __exit driver_aio_iiro_16_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_aio_iiro_16);
-}
-module_exit(driver_aio_iiro_16_cleanup_module);
+module_comedi_driver(aio_iiro_16_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/c6xdigio.c b/trunk/drivers/staging/comedi/drivers/c6xdigio.c
@@ -508,24 +508,13 @@ static int c6xdigio_detach(struct comedi_device *dev)
 	return 0;
 }
 
-struct comedi_driver driver_c6xdigio = {
+static struct comedi_driver c6xdigio_driver = {
 	.driver_name	= "c6xdigio",
 	.module		= THIS_MODULE,
 	.attach		= c6xdigio_attach,
 	.detach		= c6xdigio_detach,
 };
-
-static int __init driver_c6xdigio_init_module(void)
-{
-	return comedi_driver_register(&driver_c6xdigio);
-}
-module_init(driver_c6xdigio_init_module);
-
-static void __exit driver_c6xdigio_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_c6xdigio);
-}
-module_exit(driver_c6xdigio_cleanup_module);
+module_comedi_driver(c6xdigio_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/dt2815.c b/trunk/drivers/staging/comedi/drivers/dt2815.c
@@ -242,24 +242,13 @@ static int dt2815_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_dt2815 = {
+static struct comedi_driver dt2815_driver = {
 	.driver_name	= "dt2815",
 	.module		= THIS_MODULE,
 	.attach		= dt2815_attach,
 	.detach		= dt2815_detach,
 };
-
-static int __init driver_dt2815_init_module(void)
-{
-	return comedi_driver_register(&driver_dt2815);
-}
-module_init(driver_dt2815_init_module);
-
-static void __exit driver_dt2815_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_dt2815);
-}
-module_exit(driver_dt2815_cleanup_module);
+module_comedi_driver(dt2815_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/dt2817.c b/trunk/drivers/staging/comedi/drivers/dt2817.c
@@ -169,24 +169,13 @@ static int dt2817_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_dt2817 = {
+static struct comedi_driver dt2817_driver = {
 	.driver_name	= "dt2817",
 	.module		= THIS_MODULE,
 	.attach		= dt2817_attach,
 	.detach		= dt2817_detach,
 };
-
-static int __init driver_dt2817_init_module(void)
-{
-	return comedi_driver_register(&driver_dt2817);
-}
-module_init(driver_dt2817_init_module);
-
-static void __exit driver_dt2817_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_dt2817);
-}
-module_exit(driver_dt2817_cleanup_module);
+module_comedi_driver(dt2817_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/fl512.c b/trunk/drivers/staging/comedi/drivers/fl512.c
@@ -182,24 +182,13 @@ static int fl512_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_fl512 = {
+static struct comedi_driver fl512_driver = {
 	.driver_name	= "fl512",
 	.module		= THIS_MODULE,
 	.attach		= fl512_attach,
 	.detach		= fl512_detach,
 };
-
-static int __init driver_fl512_init_module(void)
-{
-	return comedi_driver_register(&driver_fl512);
-}
-module_init(driver_fl512_init_module);
-
-static void __exit driver_fl512_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_fl512);
-}
-module_exit(driver_fl512_cleanup_module);
+module_comedi_driver(fl512_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/pcl711.c b/trunk/drivers/staging/comedi/drivers/pcl711.c
@@ -611,7 +611,7 @@ static const struct pcl711_board boardtypes[] = {
 	{ "acl8112dg", 0, 1, 1, 9, 16, 2, 15, &range_acl8112dg_ai },
 };
 
-static struct comedi_driver driver_pcl711 = {
+static struct comedi_driver pcl711_driver = {
 	.driver_name	= "pcl711",
 	.module		= THIS_MODULE,
 	.attach		= pcl711_attach,
@@ -620,18 +620,7 @@ static struct comedi_driver driver_pcl711 = {
 	.num_names	= ARRAY_SIZE(boardtypes),
 	.offset		= sizeof(struct pcl711_board),
 };
-
-static int __init driver_pcl711_init_module(void)
-{
-	return comedi_driver_register(&driver_pcl711);
-}
-module_init(driver_pcl711_init_module);
-
-static void __exit driver_pcl711_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_pcl711);
-}
-module_exit(driver_pcl711_cleanup_module);
+module_comedi_driver(pcl711_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/pcl724.c b/trunk/drivers/staging/comedi/drivers/pcl724.c
@@ -205,7 +205,7 @@ static const struct pcl724_board boardtypes[] = {
 	{ "pet48dio", 48, 2, 0x9eb8, PET48_SIZE, 0, 1, },
 };
 
-static struct comedi_driver driver_pcl724 = {
+static struct comedi_driver pcl724_driver = {
 	.driver_name	= "pcl724",
 	.module		= THIS_MODULE,
 	.attach		= pcl724_attach,
@@ -214,18 +214,7 @@ static struct comedi_driver driver_pcl724 = {
 	.num_names	= ARRAY_SIZE(boardtypes),
 	.offset		= sizeof(struct pcl724_board),
 };
-
-static int __init driver_pcl724_init_module(void)
-{
-	return comedi_driver_register(&driver_pcl724);
-}
-module_init(driver_pcl724_init_module);
-
-static void __exit driver_pcl724_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_pcl724);
-}
-module_exit(driver_pcl724_cleanup_module);
+module_comedi_driver(pcl724_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/pcl725.c b/trunk/drivers/staging/comedi/drivers/pcl725.c
@@ -99,24 +99,13 @@ static int pcl725_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_pcl725 = {
+static struct comedi_driver pcl725_driver = {
 	.driver_name	= "pcl725",
 	.module		= THIS_MODULE,
 	.attach		= pcl725_attach,
 	.detach		= pcl725_detach,
 };
-
-static int __init driver_pcl725_init_module(void)
-{
-	return comedi_driver_register(&driver_pcl725);
-}
-module_init(driver_pcl725_init_module);
-
-static void __exit driver_pcl725_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_pcl725);
-}
-module_exit(driver_pcl725_cleanup_module);
+module_comedi_driver(pcl725_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");

diff --git a/trunk/drivers/staging/comedi/drivers/pcl726.c b/trunk/drivers/staging/comedi/drivers/pcl726.c
@@ -365,7 +365,7 @@ static int pcl726_detach(struct comedi_device *dev)
 	return 0;
 }
 
-static struct comedi_driver driver_pcl726 = {
+static struct comedi_driver pcl726_driver = {
 	.driver_name	= "pcl726",
 	.module		= THIS_MODULE,
 	.attach		= pcl726_attach,
@@ -374,18 +374,7 @@ static struct comedi_driver driver_pcl726 = {
 	.num_names	= ARRAY_SIZE(boardtypes),
 	.offset		= sizeof(struct pcl726_board),
 };
-
-static int __init driver_pcl726_init_module(void)
-{
-	return comedi_driver_register(&driver_pcl726);
-}
-module_init(driver_pcl726_init_module);
-
-static void __exit driver_pcl726_cleanup_module(void)
-{
-	comedi_driver_unregister(&driver_pcl726);
-}
-module_exit(driver_pcl726_cleanup_module);
+module_comedi_driver(pcl726_driver);
 
 MODULE_AUTHOR("Comedi http://www.comedi.org");
 MODULE_DESCRIPTION("Comedi low-level driver");