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

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

staging: comedi: usbduxsigma: use module_comedi_usb_driver() 



Use the module_comedi_usb_driver helper macro to initialize this
module. Rename the driver structs to follow the pattern of the
other comedi driver types and add some whitespace to improve
readability.

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

drivers/staging/comedi/drivers/usbduxsigma.c

+14 −35
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static struct usbduxsub usbduxsub[NUMUSBDUX]; 


static DEFINE_SEMAPHORE(start_stop_sem);



static struct comedi_driver driver_usbduxsigma;	/* see below for initializer */

static struct comedi_driver usbduxsigma_driver;	/* see below for initializer */



/*

 * Stops the data acquision
@@ -2331,7 +2331,7 @@ static void usbdux_firmware_request_complete_handler(const struct firmware *fw, 
			"Could not upload firmware (err=%d)\n", ret);

		goto out;

	}

	comedi_usb_auto_config(uinterf, &driver_usbduxsigma);

	comedi_usb_auto_config(uinterf, &usbduxsigma_driver);

out:

	release_firmware(fw);

}
@@ -2828,7 +2828,7 @@ static void usbduxsigma_detach(struct comedi_device *dev) 
}



/* main driver struct */

static struct comedi_driver driver_usbduxsigma = {

static struct comedi_driver usbduxsigma_driver = {

	.driver_name	= "usbduxsigma",

	.module		= THIS_MODULE,

	.attach		= usbduxsigma_attach,
@@ -2847,34 +2847,13 @@ static const struct usb_device_id usbduxsigma_table[] = { 
MODULE_DEVICE_TABLE(usb, usbduxsigma_table);



/* The usbduxsub-driver */

static struct usb_driver usbduxsigma_driver = {

static struct usb_driver usbduxsigma_usb_driver = {

	.name		= BOARDNAME,

	.probe		= usbduxsigma_probe,

	.disconnect	= usbduxsigma_disconnect,

	.id_table	= usbduxsigma_table,

};



/* Can't use the nice macro as I have also to initialise the USB */

/* subsystem: */

/* registering the usb-system _and_ the comedi-driver */

static int __init init_usbduxsigma(void)

{

	printk(KERN_INFO KBUILD_MODNAME ": "

	       DRIVER_VERSION ":" DRIVER_DESC "\n");

	usb_register(&usbduxsigma_driver);

	comedi_driver_register(&driver_usbduxsigma);

	return 0;

}



/* deregistering the comedi driver and the usb-subsystem */

static void __exit exit_usbduxsigma(void)

{

	comedi_driver_unregister(&driver_usbduxsigma);

	usb_deregister(&usbduxsigma_driver);

}



module_init(init_usbduxsigma);

module_exit(exit_usbduxsigma);

module_comedi_usb_driver(usbduxsigma_driver, usbduxsigma_usb_driver);



MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);