Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 294f930d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: use module_comedi_driver 



Convert the refactored comedi drivers to use the module_comedi_driver()
macro which makes the code smaller and a bit simpler.

In the process, rename the driver variables from driver_* to *_driver,
as is more typical with other subsystems, and make sure they are all
static.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Mori Hess <fmhess@users.sourceforge.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent feb5680e

drivers/staging/comedi/drivers/8255.c

+2 −13
Original line number Diff line number Diff line
@@ -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");

drivers/staging/comedi/drivers/acl7225b.c

+2 −13
Original line number Diff line number Diff line
@@ -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");

drivers/staging/comedi/drivers/adq12b.c

+2 −13
Original line number Diff line number Diff line
@@ -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");

drivers/staging/comedi/drivers/aio_aio12_8.c

+9 −21
Original line number Diff line number Diff line
@@ -217,28 +217,16 @@ static int aio_aio12_8_detach(struct comedi_device *dev) 
	return 0;

}



static struct comedi_driver driver_aio_aio12_8 = {

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 = 1,

	.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");

drivers/staging/comedi/drivers/aio_iiro_16.c

+2 −13
Original line number Diff line number Diff line
@@ -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");