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

Commit d29b854f authored by Chris Rorvick's avatar Chris Rorvick Committed by Takashi Iwai
Browse files

staging: line6: Make *_disconnect() functions static 



Remove declarations from the header and move the definitions up in the
source so they need not be forward declared.

Signed-off-by: default avatarChris Rorvick <chris@rorvick.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent a46c4672

drivers/staging/line6/pod.c

+29 −29
Original line number Diff line number Diff line
@@ -337,6 +337,35 @@ static void pod_destruct(struct usb_interface *interface) 
	cancel_work_sync(&pod->startup_work);

}



/*

	POD device disconnected.

*/

static void line6_pod_disconnect(struct usb_interface *interface)

{

	struct usb_line6_pod *pod;



	if (interface == NULL)

		return;

	pod = usb_get_intfdata(interface);



	if (pod != NULL) {

		struct snd_line6_pcm *line6pcm = pod->line6.line6pcm;

		struct device *dev = &interface->dev;



		if (line6pcm != NULL)

			line6_pcm_disconnect(line6pcm);



		if (dev != NULL) {

			/* remove sysfs entries: */

			device_remove_file(dev, &dev_attr_device_id);

			device_remove_file(dev, &dev_attr_firmware_version);

			device_remove_file(dev, &dev_attr_serial_number);

		}

	}



	pod_destruct(interface);

}



/*

	Create sysfs entries.

*/
@@ -422,32 +451,3 @@ int line6_pod_init(struct usb_interface *interface, struct usb_line6 *line6) 


	return err;

}
 


/*

	POD device disconnected.

*/

void line6_pod_disconnect(struct usb_interface *interface)

{

	struct usb_line6_pod *pod;



	if (interface == NULL)

		return;

	pod = usb_get_intfdata(interface);



	if (pod != NULL) {

		struct snd_line6_pcm *line6pcm = pod->line6.line6pcm;

		struct device *dev = &interface->dev;



		if (line6pcm != NULL)

			line6_pcm_disconnect(line6pcm);



		if (dev != NULL) {

			/* remove sysfs entries: */

			device_remove_file(dev, &dev_attr_device_id);

			device_remove_file(dev, &dev_attr_firmware_version);

			device_remove_file(dev, &dev_attr_serial_number);

		}

	}



	pod_destruct(interface);

}

drivers/staging/line6/pod.h

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ struct usb_line6_pod { 
	int device_id;

};



extern void line6_pod_disconnect(struct usb_interface *interface);

extern int line6_pod_init(struct usb_interface *interface,

			  struct usb_line6 *line6);

drivers/staging/line6/podhd.c

+21 −21
Original line number Diff line number Diff line
@@ -86,6 +86,27 @@ static void podhd_destruct(struct usb_interface *interface) 
	line6_cleanup_audio(&podhd->line6);

}



/*

	POD HD device disconnected.

*/

static void line6_podhd_disconnect(struct usb_interface *interface)

{

	struct usb_line6_podhd *podhd;



	if (interface == NULL)

		return;

	podhd = usb_get_intfdata(interface);



	if (podhd != NULL) {

		struct snd_line6_pcm *line6pcm = podhd->line6.line6pcm;



		if (line6pcm != NULL)

			line6_pcm_disconnect(line6pcm);

	}



	podhd_destruct(interface);

}



/*

	Try to init POD HD device.

*/
@@ -133,24 +154,3 @@ int line6_podhd_init(struct usb_interface *interface, struct usb_line6 *line6) 


	return err;

}
 


/*

	POD HD device disconnected.

*/

void line6_podhd_disconnect(struct usb_interface *interface)

{

	struct usb_line6_podhd *podhd;



	if (interface == NULL)

		return;

	podhd = usb_get_intfdata(interface);



	if (podhd != NULL) {

		struct snd_line6_pcm *line6pcm = podhd->line6.line6pcm;



		if (line6pcm != NULL)

			line6_pcm_disconnect(line6pcm);

	}



	podhd_destruct(interface);

}

drivers/staging/line6/podhd.h

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ struct usb_line6_podhd { 
	struct usb_line6 line6;

};



extern void line6_podhd_disconnect(struct usb_interface *interface);

extern int line6_podhd_init(struct usb_interface *interface,

			    struct usb_line6 *line6);

drivers/staging/line6/toneport.c

+33 −31
Original line number Diff line number Diff line
@@ -335,6 +335,39 @@ static void toneport_setup(struct usb_line6_toneport *toneport) 
		toneport_update_led(&usbdev->dev);

}



/*

	Toneport device disconnected.

*/

static void line6_toneport_disconnect(struct usb_interface *interface)

{

	struct usb_line6_toneport *toneport;

	u16 idProduct;



	if (interface == NULL)

		return;



	toneport = usb_get_intfdata(interface);

	del_timer_sync(&toneport->timer);

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



	if (toneport_has_led(idProduct)) {

		device_remove_file(&interface->dev, &dev_attr_led_red);

		device_remove_file(&interface->dev, &dev_attr_led_green);

	}



	if (toneport != NULL) {

		struct snd_line6_pcm *line6pcm = toneport->line6.line6pcm;



		if (line6pcm != NULL) {

			line6_pcm_release(line6pcm, LINE6_BITS_PCM_MONITOR);

			line6_pcm_disconnect(line6pcm);

		}

	}



	toneport_destruct(interface);

}





/*

	 Try to init Toneport device.

*/
@@ -430,34 +463,3 @@ void line6_toneport_reset_resume(struct usb_line6_toneport *toneport) 
{

	toneport_setup(toneport);

}
 


/*

	Toneport device disconnected.

*/

void line6_toneport_disconnect(struct usb_interface *interface)

{

	struct usb_line6_toneport *toneport;

	struct snd_line6_pcm *line6pcm;



	if (interface == NULL)

		return;



	toneport = usb_get_intfdata(interface);

	if (NULL == toneport)

		return;



	del_timer_sync(&toneport->timer);



	if (toneport_has_led(toneport->line6.type)) {

		device_remove_file(&interface->dev, &dev_attr_led_red);

		device_remove_file(&interface->dev, &dev_attr_led_green);

	}



	line6pcm = toneport->line6.line6pcm;

	if (line6pcm != NULL) {

		line6_pcm_release(line6pcm, LINE6_BITS_PCM_MONITOR);

		line6_pcm_disconnect(line6pcm);

	}



	toneport_destruct(interface);

}