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

Commit 7114a280 authored by Arun Thomas's avatar Arun Thomas Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove COMEDI_INITCLEANUP macro 



Move the init/exit routines to the respective C source files
instead of calling COMEDI_INITCLEANUP

Signed-off-by: default avatarArun Thomas <arun.thomas@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 90f703d3

drivers/staging/comedi/comedidev.h

+0 −11
Original line number Diff line number Diff line
@@ -53,17 +53,6 @@ 
	COMEDI_MINORVERSION, COMEDI_MICROVERSION)

#define COMEDI_RELEASE VERSION



#define COMEDI_INITCLEANUP_NOMODULE(x)					\

	static int __init x ## _init_module(void)			\

		{return comedi_driver_register(&(x)); }			\

	static void __exit x ## _cleanup_module(void)			\

		{comedi_driver_unregister(&(x)); }			\

	module_init(x ## _init_module);					\

	module_exit(x ## _cleanup_module);



#define COMEDI_INITCLEANUP(x)						\

	COMEDI_INITCLEANUP_NOMODULE(x)



#define COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table) \

	static int __devinit comedi_driver ## _pci_probe(struct pci_dev *dev, \

		const struct pci_device_id *ent) \

drivers/staging/comedi/drivers/8255.c

+12 −1
Original line number Diff line number Diff line
@@ -117,7 +117,18 @@ static struct comedi_driver driver_8255 = { 
	.detach = dev_8255_detach,

};



COMEDI_INITCLEANUP(driver_8255);

static int __init driver_8255_init_module(void)

{

	return comedi_driver_register(&driver_8255);

}



static void __exit driver_8255_cleanup_module(void)

{

	comedi_driver_unregister(&driver_8255);

}



module_init(driver_8255_init_module);

module_exit(driver_8255_cleanup_module);



static void do_config(struct comedi_device *dev, struct comedi_subdevice *s);

drivers/staging/comedi/drivers/acl7225b.c

+12 −1
Original line number Diff line number Diff line
@@ -49,7 +49,18 @@ static struct comedi_driver driver_acl7225b = { 
	.offset = sizeof(struct boardtype),

};



COMEDI_INITCLEANUP(driver_acl7225b);

static int __init driver_acl7225b_init_module(void)

{

	return comedi_driver_register(&driver_acl7225b);

}



static void __exit driver_acl7225b_cleanup_module(void)

{

	comedi_driver_unregister(&driver_acl7225b);

}



module_init(driver_acl7225b_init_module);

module_exit(driver_acl7225b_cleanup_module);



static int acl7225b_do_insn(struct comedi_device *dev,

			    struct comedi_subdevice *s,

drivers/staging/comedi/drivers/adq12b.c

+12 −1
Original line number Diff line number Diff line
@@ -402,7 +402,18 @@ static int adq12b_do_insn_bits(struct comedi_device *dev, 
 * A convenient macro that defines init_module() and cleanup_module(),

 * as necessary.

 */

COMEDI_INITCLEANUP(driver_adq12b);

static int __init driver_adq12b_init_module(void)

{

	return comedi_driver_register(&driver_adq12b);

}



static void __exit driver_adq12b_cleanup_module(void)

{

	comedi_driver_unregister(&driver_adq12b);

}



module_init(driver_adq12b_init_module);

module_exit(driver_adq12b_cleanup_module);



MODULE_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");

drivers/staging/comedi/drivers/aio_aio12_8.c

+12 −1
Original line number Diff line number Diff line
@@ -227,7 +227,18 @@ static struct comedi_driver driver_aio_aio12_8 = { 
	.offset = sizeof(struct aio12_8_boardtype),

};



COMEDI_INITCLEANUP(driver_aio_aio12_8);

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_AUTHOR("Comedi http://www.comedi.org");

MODULE_DESCRIPTION("Comedi low-level driver");