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

Commit 8a3b7c08 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: line6: Remove superfluous NULL checks in each driver 



The interface and driver objects are always set when callbacks are
called.  Drop such superfluous NULL checks in init and disconnect
calls of each driver.

Tested-by: default avatarChris Rorvick <chris@rorvick.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 2a324fcd

sound/usb/line6/pod.c

+8 −20
Original line number Original line Diff line number Diff line
@@ -401,26 +401,17 @@ static struct snd_kcontrol_new pod_control_monitor = { 
*/

*/

static void line6_pod_disconnect(struct usb_interface *interface)

static void line6_pod_disconnect(struct usb_interface *interface)

{

{

	struct usb_line6_pod *pod;

	struct usb_line6_pod *pod = usb_get_intfdata(interface);



	if (interface == NULL)

		return;

	pod = usb_get_intfdata(interface);



	if (pod != NULL) {

	struct device *dev = &interface->dev;

	struct device *dev = &interface->dev;





		if (dev != NULL) {

	/* remove sysfs entries: */

	/* remove sysfs entries: */

	device_remove_file(dev, &dev_attr_device_id);

	device_remove_file(dev, &dev_attr_device_id);

	device_remove_file(dev, &dev_attr_firmware_version);

	device_remove_file(dev, &dev_attr_firmware_version);

	device_remove_file(dev, &dev_attr_serial_number);

	device_remove_file(dev, &dev_attr_serial_number);

		}





	del_timer_sync(&pod->startup_timer);

	del_timer_sync(&pod->startup_timer);

	cancel_work_sync(&pod->startup_work);

	cancel_work_sync(&pod->startup_work);

}

}

}





/*

/*

	Create sysfs entries.

	Create sysfs entries.
@@ -456,9 +447,6 @@ static int pod_init(struct usb_interface *interface, 
	init_timer(&pod->startup_timer);

	init_timer(&pod->startup_timer);

	INIT_WORK(&pod->startup_work, pod_startup4);

	INIT_WORK(&pod->startup_work, pod_startup4);





	if ((interface == NULL) || (pod == NULL))

		return -ENODEV;



	/* create sysfs entries: */

	/* create sysfs entries: */

	err = pod_create_files2(&interface->dev);

	err = pod_create_files2(&interface->dev);

	if (err < 0)

	if (err < 0)

sound/usb/line6/podhd.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -90,12 +90,8 @@ static struct line6_pcm_properties podhd_pcm_properties = { 
static int podhd_init(struct usb_interface *interface,

static int podhd_init(struct usb_interface *interface,

		      struct usb_line6 *line6)

		      struct usb_line6 *line6)

{

{

	struct usb_line6_podhd *podhd = (struct usb_line6_podhd *) line6;

	int err;

	int err;





	if ((interface == NULL) || (podhd == NULL))

		return -ENODEV;



	/* initialize MIDI subsystem: */

	/* initialize MIDI subsystem: */

	err = line6_init_midi(line6);

	err = line6_init_midi(line6);

	if (err < 0)

	if (err < 0)

sound/usb/line6/toneport.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -370,9 +370,6 @@ static void line6_toneport_disconnect(struct usb_interface *interface) 
	struct usb_line6_toneport *toneport;

	struct usb_line6_toneport *toneport;

	u16 idProduct;

	u16 idProduct;





	if (interface == NULL)

		return;



	toneport = usb_get_intfdata(interface);

	toneport = usb_get_intfdata(interface);

	del_timer_sync(&toneport->timer);

	del_timer_sync(&toneport->timer);

	idProduct = le16_to_cpu(toneport->line6.usbdev->descriptor.idProduct);

	idProduct = le16_to_cpu(toneport->line6.usbdev->descriptor.idProduct);
@@ -393,9 +390,6 @@ static int toneport_init(struct usb_interface *interface, 
	int err;

	int err;

	struct usb_line6_toneport *toneport =  (struct usb_line6_toneport *) line6;

	struct usb_line6_toneport *toneport =  (struct usb_line6_toneport *) line6;





	if ((interface == NULL) || (toneport == NULL))

		return -ENODEV;



	line6->disconnect = line6_toneport_disconnect;

	line6->disconnect = line6_toneport_disconnect;





	/* initialize PCM subsystem: */

	/* initialize PCM subsystem: */

sound/usb/line6/variax.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -214,12 +214,7 @@ static void line6_variax_disconnect(struct usb_interface *interface) 
{

{

	struct usb_line6_variax *variax;

	struct usb_line6_variax *variax;





	if (!interface)

		return;



	variax = usb_get_intfdata(interface);

	variax = usb_get_intfdata(interface);

	if (!variax)

		return;





	del_timer(&variax->startup_timer1);

	del_timer(&variax->startup_timer1);

	del_timer(&variax->startup_timer2);

	del_timer(&variax->startup_timer2);
@@ -244,9 +239,6 @@ static int variax_init(struct usb_interface *interface, 
	init_timer(&variax->startup_timer2);

	init_timer(&variax->startup_timer2);

	INIT_WORK(&variax->startup_work, variax_startup6);

	INIT_WORK(&variax->startup_work, variax_startup6);





	if ((interface == NULL) || (variax == NULL))

		return -ENODEV;



	/* initialize USB buffers: */

	/* initialize USB buffers: */

	variax->buffer_activate = kmemdup(variax_activate,

	variax->buffer_activate = kmemdup(variax_activate,

					  sizeof(variax_activate), GFP_KERNEL);

					  sizeof(variax_activate), GFP_KERNEL);