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

Commit 4e9adfbc authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: comedi_pci.h: move PCI stuff out of comedidev.h 



Move the PCI-specific stuff out of "comedidev.h" into "comedi_pci.h".
Comedi PCI drivers now include "comedi_pci.h" instead of "comedidev.h",
which now gets pulled in indirectly.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6ab38b05

drivers/staging/comedi/comedi_pci.h

+35 −1
Original line number Diff line number Diff line
@@ -24,7 +24,41 @@ 
#include "comedidev.h"



/*

 * TODO: Move PCI-specific stuff into here from "comedidev.h".

 * PCI Vendor IDs not in <linux/pci_ids.h>

 */

#define PCI_VENDOR_ID_KOLTER		0x1001

#define PCI_VENDOR_ID_ICP		0x104c

#define PCI_VENDOR_ID_DT		0x1116

#define PCI_VENDOR_ID_IOTECH		0x1616

#define PCI_VENDOR_ID_CONTEC		0x1221

#define PCI_VENDOR_ID_RTD		0x1435

#define PCI_VENDOR_ID_HUMUSOFT		0x186c



struct pci_dev *comedi_to_pci_dev(struct comedi_device *);



int comedi_pci_enable(struct comedi_device *);

void comedi_pci_disable(struct comedi_device *);

void comedi_pci_detach(struct comedi_device *);



int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *,

			   unsigned long context);

void comedi_pci_auto_unconfig(struct pci_dev *);



int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *);

void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *);



/**

 * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver

 * @__comedi_driver: comedi_driver struct

 * @__pci_driver: pci_driver struct

 *

 * Helper macro for comedi PCI drivers which do not do anything special

 * in module init/exit. This eliminates a lot of boilerplate. Each

 * module may only use this macro once, and calling it replaces

 * module_init() and module_exit()

 */

#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \

	module_driver(__comedi_driver, comedi_pci_driver_register, \

			comedi_pci_driver_unregister, &(__pci_driver))



#endif /* _COMEDI_PCI_H */

drivers/staging/comedi/comedidev.h

+0 −43
Original line number Diff line number Diff line
@@ -554,47 +554,4 @@ void comedi_driver_unregister(struct comedi_driver *); 
	module_driver(__comedi_driver, comedi_driver_register, \

			comedi_driver_unregister)



/* comedi_pci.c - comedi PCI driver specific functions */



/*

 * PCI Vendor IDs not in <linux/pci_ids.h>

 */

#define PCI_VENDOR_ID_KOLTER		0x1001

#define PCI_VENDOR_ID_ICP		0x104c

#define PCI_VENDOR_ID_DT		0x1116

#define PCI_VENDOR_ID_IOTECH		0x1616

#define PCI_VENDOR_ID_CONTEC		0x1221

#define PCI_VENDOR_ID_RTD		0x1435

#define PCI_VENDOR_ID_HUMUSOFT		0x186c



struct pci_dev;

struct pci_driver;



struct pci_dev *comedi_to_pci_dev(struct comedi_device *);



int comedi_pci_enable(struct comedi_device *);

void comedi_pci_disable(struct comedi_device *);

void comedi_pci_detach(struct comedi_device *);



int comedi_pci_auto_config(struct pci_dev *, struct comedi_driver *,

			   unsigned long context);

void comedi_pci_auto_unconfig(struct pci_dev *);



int comedi_pci_driver_register(struct comedi_driver *, struct pci_driver *);

void comedi_pci_driver_unregister(struct comedi_driver *, struct pci_driver *);



/**

 * module_comedi_pci_driver() - Helper macro for registering a comedi PCI driver

 * @__comedi_driver: comedi_driver struct

 * @__pci_driver: pci_driver struct

 *

 * Helper macro for comedi PCI drivers which do not do anything special

 * in module init/exit. This eliminates a lot of boilerplate. Each

 * module may only use this macro once, and calling it replaces

 * module_init() and module_exit()

 */

#define module_comedi_pci_driver(__comedi_driver, __pci_driver) \

	module_driver(__comedi_driver, comedi_pci_driver_register, \

			comedi_pci_driver_unregister, &(__pci_driver))



#endif /* _COMEDIDEV_H */