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

Commit ae59ecfd authored by Peter Huewe's avatar Peter Huewe Committed by Greg Kroah-Hartman
Browse files

staging/comedi: use comedi_usb_driver_(un)register for init/deinit 



Instead of coding calling comedi_driver_(un)register and
usb_(de)register directly we can use the comedi_usb_driver_(un)register
wrapper.
This removes some boilerplate and is less error prone.

Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e49ee36d

drivers/staging/comedi/drivers/dt9812.c

+4 −21
Original line number Diff line number Diff line
@@ -1133,7 +1133,7 @@ static struct comedi_driver dt9812_comedi_driver = { 


static int __init usb_dt9812_init(void)

{

	int result, i;

	int i;



	/* Initialize all driver slots */

	for (i = 0; i < DT9812_NUM_SLOTS; i++) {
@@ -1144,30 +1144,13 @@ static int __init usb_dt9812_init(void) 
	}

	dt9812[12].serial = 0x0;



	/* register with the USB subsystem */

	result = usb_register(&dt9812_usb_driver);

	if (result) {

		pr_err("usb_register failed. Error number %d\n", result);

		return result;

	}

	/* register with comedi */

	result = comedi_driver_register(&dt9812_comedi_driver);

	if (result) {

		usb_deregister(&dt9812_usb_driver);

		pr_err("comedi_driver_register failed. Error number %d\n",

		       result);

	}



	return result;

	return comedi_usb_driver_register(&dt9812_comedi_driver,

						&dt9812_usb_driver);

}



static void __exit usb_dt9812_exit(void)

{

	/* unregister with comedi */

	comedi_driver_unregister(&dt9812_comedi_driver);



	/* deregister this driver with the USB subsystem */

	usb_deregister(&dt9812_usb_driver);

	comedi_usb_driver_unregister(&dt9812_comedi_driver, &dt9812_usb_driver);

}



module_init(usb_dt9812_init);