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

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

staging: comedi: comedi_usb.h: move USB stuff out of comedidev.h 



Move the USB-specific stuff out of "comedidev.h" into "comedi_usb.h".
Comedi USB drivers now include "comedi_usb.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 cf7661c7

drivers/staging/comedi/comedi_usb.h

+22 −2
Original line number Diff line number Diff line
@@ -23,8 +23,28 @@ 


#include "comedidev.h"



/*

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

struct usb_interface *comedi_to_usb_interface(struct comedi_device *);

struct usb_device *comedi_to_usb_dev(struct comedi_device *);



int comedi_usb_auto_config(struct usb_interface *, struct comedi_driver *,

			   unsigned long context);

void comedi_usb_auto_unconfig(struct usb_interface *);



int comedi_usb_driver_register(struct comedi_driver *, struct usb_driver *);

void comedi_usb_driver_unregister(struct comedi_driver *, struct usb_driver *);



/**

 * module_comedi_usb_driver() - Helper macro for registering a comedi USB driver

 * @__comedi_driver: comedi_driver struct

 * @__usb_driver: usb_driver struct

 *

 * Helper macro for comedi USB 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_usb_driver(__comedi_driver, __usb_driver) \

	module_driver(__comedi_driver, comedi_usb_driver_register, \

			comedi_usb_driver_unregister, &(__usb_driver))



#endif /* _COMEDI_USB_H */

drivers/staging/comedi/comedidev.h

+0 −29
Original line number Diff line number Diff line
@@ -629,33 +629,4 @@ void comedi_pcmcia_driver_unregister(struct comedi_driver *, 
	module_driver(__comedi_driver, comedi_pcmcia_driver_register, \

			comedi_pcmcia_driver_unregister, &(__pcmcia_driver))



/* comedi_usb.c - comedi USB driver specific functions */



struct usb_driver;

struct usb_interface;



struct usb_interface *comedi_to_usb_interface(struct comedi_device *);

struct usb_device *comedi_to_usb_dev(struct comedi_device *);



int comedi_usb_auto_config(struct usb_interface *, struct comedi_driver *,

			   unsigned long context);

void comedi_usb_auto_unconfig(struct usb_interface *);



int comedi_usb_driver_register(struct comedi_driver *, struct usb_driver *);

void comedi_usb_driver_unregister(struct comedi_driver *, struct usb_driver *);



/**

 * module_comedi_usb_driver() - Helper macro for registering a comedi USB driver

 * @__comedi_driver: comedi_driver struct

 * @__usb_driver: usb_driver struct

 *

 * Helper macro for comedi USB 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_usb_driver(__comedi_driver, __usb_driver) \

	module_driver(__comedi_driver, comedi_usb_driver_register, \

			comedi_usb_driver_unregister, &(__usb_driver))



#endif /* _COMEDIDEV_H */