From d29b854fe9036a505af373ac485b2110ebae6ccd Mon Sep 17 00:00:00 2001 From: Chris Rorvick Date: Mon, 12 Jan 2015 12:43:00 -0800 Subject: [PATCH] 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: Chris Rorvick Reviewed-by: Stefan Hajnoczi Signed-off-by: Greg Kroah-Hartman Signed-off-by: Takashi Iwai --- drivers/staging/line6/pod.c | 58 ++++++++++++++--------------- drivers/staging/line6/pod.h | 1 - drivers/staging/line6/podhd.c | 42 ++++++++++----------- drivers/staging/line6/podhd.h | 1 - drivers/staging/line6/toneport.c | 64 ++++++++++++++++---------------- drivers/staging/line6/toneport.h | 1 - drivers/staging/line6/variax.c | 22 +++++------ drivers/staging/line6/variax.h | 1 - 8 files changed, 94 insertions(+), 96 deletions(-) diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c index b9af5cf50ecf..85a43631996e 100644 --- a/drivers/staging/line6/pod.c +++ b/drivers/staging/line6/pod.c @@ -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); -} diff --git a/drivers/staging/line6/pod.h b/drivers/staging/line6/pod.h index 0d78ca76a72f..87a8f0fa9cba 100644 --- a/drivers/staging/line6/pod.h +++ b/drivers/staging/line6/pod.h @@ -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); diff --git a/drivers/staging/line6/podhd.c b/drivers/staging/line6/podhd.c index a57fbce3503e..27c5402cece8 100644 --- a/drivers/staging/line6/podhd.c +++ b/drivers/staging/line6/podhd.c @@ -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); -} diff --git a/drivers/staging/line6/podhd.h b/drivers/staging/line6/podhd.h index b7d9568e3a6c..a14f711f9725 100644 --- a/drivers/staging/line6/podhd.h +++ b/drivers/staging/line6/podhd.h @@ -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); diff --git a/drivers/staging/line6/toneport.c b/drivers/staging/line6/toneport.c index 5c462b72a850..aae78d8a82d9 100644 --- a/drivers/staging/line6/toneport.c +++ b/drivers/staging/line6/toneport.c @@ -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); -} diff --git a/drivers/staging/line6/toneport.h b/drivers/staging/line6/toneport.h index af2b4e06ce94..8cb14426f6ae 100644 --- a/drivers/staging/line6/toneport.h +++ b/drivers/staging/line6/toneport.h @@ -44,7 +44,6 @@ struct usb_line6_toneport { struct timer_list timer; }; -extern void line6_toneport_disconnect(struct usb_interface *interface); extern int line6_toneport_init(struct usb_interface *interface, struct usb_line6 *line6); extern void line6_toneport_reset_resume(struct usb_line6_toneport *toneport); diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c index ca25b41ea88b..b4a41b0ad0ea 100644 --- a/drivers/staging/line6/variax.c +++ b/drivers/staging/line6/variax.c @@ -171,6 +171,17 @@ static void variax_destruct(struct usb_interface *interface) kfree(variax->buffer_activate); } +/* + Workbench device disconnected. +*/ +static void line6_variax_disconnect(struct usb_interface *interface) +{ + if (interface == NULL) + return; + + variax_destruct(interface); +} + /* Try to init workbench device. */ @@ -226,14 +237,3 @@ int line6_variax_init(struct usb_interface *interface, struct usb_line6 *line6) return err; } - -/* - Workbench device disconnected. -*/ -void line6_variax_disconnect(struct usb_interface *interface) -{ - if (interface == NULL) - return; - - variax_destruct(interface); -} diff --git a/drivers/staging/line6/variax.h b/drivers/staging/line6/variax.h index f21ff2030f01..dfb94e574cc4 100644 --- a/drivers/staging/line6/variax.h +++ b/drivers/staging/line6/variax.h @@ -64,7 +64,6 @@ struct usb_line6_variax { int startup_progress; }; -extern void line6_variax_disconnect(struct usb_interface *interface); extern int line6_variax_init(struct usb_interface *interface, struct usb_line6 *line6); -- 2.20.1