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 <chris@rorvick.com>
Reviewed-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c
index b9af5cf50ecfd50db46903a794d950b5456cafb9..85a43631996e351e3cb0c7da2ce1240d1b5a3ce1 100644 (file)
--- 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 0d78ca76a72f2737e0fec77aaee0b0d48e202a9a..87a8f0fa9cba0ffd613e9bb35c68726bb1a17ded 100644 (file)
--- 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 a57fbce3503e93093b6c173d83ee43f0e1e125be..27c5402cece80acf37f0795e1e914d88436aa1ae 100644 (file)
--- 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 b7d9568e3a6ce9fa6b470379af372448a41de4d4..a14f711f9725db92d03669df8943edfbddc1a550 100644 (file)
--- 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 5c462b72a850ccd9ff180ef448f76630762e70fd..aae78d8a82d9be0b5c561b91c31a45890b61a3cc 100644 (file)
--- 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 af2b4e06ce941382f4c7433735c7f89d4385107f..8cb14426f6ae2c3f7b5503038c289e533e240dbf 100644 (file)
--- 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 ca25b41ea88bac0860b1041fdf0d62a37f165d7d..b4a41b0ad0eaf064203988a33d29646d815ca83b 100644 (file)
--- 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 f21ff2030f018871216d2e6920d2e870b4a12431..dfb94e574cc445248525ba96cd14aaaba2199e39 100644 (file)
--- 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);