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

Commit 727b286b authored by Arun Thomas's avatar Arun Thomas Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove COMEDI_PCI_INITCLEANUP macro 



Move the PCI devinit/devexit routines to the respective C source files
instead of calling COMEDI_PCI_INITCLEANUP

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

drivers/staging/comedi/comedidev.h

+0 −38
Original line number Diff line number Diff line
@@ -53,44 +53,6 @@ 
	COMEDI_MINORVERSION, COMEDI_MICROVERSION)

#define COMEDI_RELEASE VERSION



#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) \

	{ \

		return comedi_pci_auto_config(dev, comedi_driver.driver_name); \

	} \

	static void __devexit comedi_driver ## _pci_remove(\

		struct pci_dev *dev) \

	{ \

		comedi_pci_auto_unconfig(dev); \

	} \

	static struct pci_driver comedi_driver ## _pci_driver = \

	{ \

		.id_table = pci_id_table, \

		.probe = &comedi_driver ## _pci_probe, \

		.remove = __devexit_p(&comedi_driver ## _pci_remove) \

	}; \

	static int __init comedi_driver ## _init_module(void) \

	{ \

		int retval; \

		retval = comedi_driver_register(&comedi_driver); \

		if (retval < 0) \

			return retval; \

			comedi_driver ## _pci_driver.name = \

				(char *)comedi_driver.driver_name; \

		return pci_register_driver(&comedi_driver ## _pci_driver); \

	} \

	static void __exit comedi_driver ## _cleanup_module(void) \

	{ \

		pci_unregister_driver(&comedi_driver ## _pci_driver); \

		comedi_driver_unregister(&comedi_driver); \

	} \

	module_init(comedi_driver ## _init_module); \

	module_exit(comedi_driver ## _cleanup_module);



#define COMEDI_PCI_INITCLEANUP(comedi_driver, pci_id_table) \

	COMEDI_PCI_INITCLEANUP_NOMODULE(comedi_driver, pci_id_table)



#define PCI_VENDOR_ID_ADLINK		0x144a

#define PCI_VENDOR_ID_ICP		0x104c

#define PCI_VENDOR_ID_CONTEC		0x1221

drivers/staging/comedi/drivers/addi-data/addi_common.c

+37 −1
Original line number Diff line number Diff line
@@ -2541,7 +2541,43 @@ static struct comedi_driver driver_addi = { 
	.offset = sizeof(struct addi_board),

};



COMEDI_PCI_INITCLEANUP(driver_addi, addi_apci_tbl);

static int __devinit driver_addi_pci_probe(struct pci_dev *dev,

					   const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, driver_addi.driver_name);

}



static void __devexit driver_addi_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static struct pci_driver driver_addi_pci_driver = {

	.id_table = addi_apci_tbl,

	.probe = &driver_addi_pci_probe,

	.remove = __devexit_p(&driver_addi_pci_remove)

};



static int __init driver_addi_init_module(void)

{

	int retval;



	retval = comedi_driver_register(&driver_addi);

	if (retval < 0)

		return retval;



	driver_addi_pci_driver.name = (char *)driver_addi.driver_name;

	return pci_register_driver(&driver_addi_pci_driver);

}



static void __exit driver_addi_cleanup_module(void)

{

	pci_unregister_driver(&driver_addi_pci_driver);

	comedi_driver_unregister(&driver_addi);

}



module_init(driver_addi_init_module);

module_exit(driver_addi_cleanup_module);



/*

+----------------------------------------------------------------------------+

drivers/staging/comedi/drivers/adl_pci6208.c

+37 −1
Original line number Diff line number Diff line
@@ -119,7 +119,43 @@ static struct comedi_driver driver_pci6208 = { 
	.detach = pci6208_detach,

};



COMEDI_PCI_INITCLEANUP(driver_pci6208, pci6208_pci_table);

static int __devinit driver_pci6208_pci_probe(struct pci_dev *dev,

					      const struct pci_device_id *ent)

{

	return comedi_pci_auto_config(dev, driver_pci6208.driver_name);

}



static void __devexit driver_pci6208_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static struct pci_driver driver_pci6208_pci_driver = {

	.id_table = pci6208_pci_table,

	.probe = &driver_pci6208_pci_probe,

	.remove = __devexit_p(&driver_pci6208_pci_remove)

};



static int __init driver_pci6208_init_module(void)

{

	int retval;



	retval = comedi_driver_register(&driver_pci6208);

	if (retval < 0)

		return retval;



	driver_pci6208_pci_driver.name = (char *)driver_pci6208.driver_name;

	return pci_register_driver(&driver_pci6208_pci_driver);

}



static void __exit driver_pci6208_cleanup_module(void)

{

	pci_unregister_driver(&driver_pci6208_pci_driver);

	comedi_driver_unregister(&driver_pci6208);

}



module_init(driver_pci6208_init_module);

module_exit(driver_pci6208_cleanup_module);



static int pci6208_find_device(struct comedi_device *dev, int bus, int slot);

static int

drivers/staging/comedi/drivers/adl_pci7230.c

+39 −1
Original line number Diff line number Diff line
@@ -203,7 +203,45 @@ static int adl_pci7230_di_insn_bits(struct comedi_device *dev, 
	return 2;

}



COMEDI_PCI_INITCLEANUP(driver_adl_pci7230, adl_pci7230_pci_table);

static int __devinit driver_adl_pci7230_pci_probe(struct pci_dev *dev,

						  const struct pci_device_id

						  *ent)

{

	return comedi_pci_auto_config(dev, driver_adl_pci7230.driver_name);

}



static void __devexit driver_adl_pci7230_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static struct pci_driver driver_adl_pci7230_pci_driver = {

	.id_table = adl_pci7230_pci_table,

	.probe = &driver_adl_pci7230_pci_probe,

	.remove = __devexit_p(&driver_adl_pci7230_pci_remove)

};



static int __init driver_adl_pci7230_init_module(void)

{

	int retval;



	retval = comedi_driver_register(&driver_adl_pci7230);

	if (retval < 0)

		return retval;



	driver_adl_pci7230_pci_driver.name =

	    (char *)driver_adl_pci7230.driver_name;

	return pci_register_driver(&driver_adl_pci7230_pci_driver);

}



static void __exit driver_adl_pci7230_cleanup_module(void)

{

	pci_unregister_driver(&driver_adl_pci7230_pci_driver);

	comedi_driver_unregister(&driver_adl_pci7230);

}



module_init(driver_adl_pci7230_init_module);

module_exit(driver_adl_pci7230_cleanup_module);



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

MODULE_DESCRIPTION("Comedi low-level driver");

drivers/staging/comedi/drivers/adl_pci7296.c

+39 −1
Original line number Diff line number Diff line
@@ -177,7 +177,45 @@ static int adl_pci7296_detach(struct comedi_device *dev) 
	return 0;

}



COMEDI_PCI_INITCLEANUP(driver_adl_pci7296, adl_pci7296_pci_table);

static int __devinit driver_adl_pci7296_pci_probe(struct pci_dev *dev,

						  const struct pci_device_id

						  *ent)

{

	return comedi_pci_auto_config(dev, driver_adl_pci7296.driver_name);

}



static void __devexit driver_adl_pci7296_pci_remove(struct pci_dev *dev)

{

	comedi_pci_auto_unconfig(dev);

}



static struct pci_driver driver_adl_pci7296_pci_driver = {

	.id_table = adl_pci7296_pci_table,

	.probe = &driver_adl_pci7296_pci_probe,

	.remove = __devexit_p(&driver_adl_pci7296_pci_remove)

};



static int __init driver_adl_pci7296_init_module(void)

{

	int retval;



	retval = comedi_driver_register(&driver_adl_pci7296);

	if (retval < 0)

		return retval;



	driver_adl_pci7296_pci_driver.name =

	    (char *)driver_adl_pci7296.driver_name;

	return pci_register_driver(&driver_adl_pci7296_pci_driver);

}



static void __exit driver_adl_pci7296_cleanup_module(void)

{

	pci_unregister_driver(&driver_adl_pci7296_pci_driver);

	comedi_driver_unregister(&driver_adl_pci7296);

}



module_init(driver_adl_pci7296_init_module);

module_exit(driver_adl_pci7296_cleanup_module);



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

MODULE_DESCRIPTION("Comedi low-level driver");