Skip to content

Commit

Permalink
staging: line6: Make *_disconnect() functions static
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Chris Rorvick authored and Takashi Iwai committed Jan 12, 2015
1 parent a46c467 commit d29b854
Show file tree
Hide file tree
Showing 8 changed files with 94 additions and 96 deletions.
58 changes: 29 additions & 29 deletions drivers/staging/line6/pod.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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);
}
1 change: 0 additions & 1 deletion drivers/staging/line6/pod.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
42 changes: 21 additions & 21 deletions drivers/staging/line6/podhd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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);
}
1 change: 0 additions & 1 deletion drivers/staging/line6/podhd.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
64 changes: 33 additions & 31 deletions drivers/staging/line6/toneport.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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);
}
1 change: 0 additions & 1 deletion drivers/staging/line6/toneport.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
22 changes: 11 additions & 11 deletions drivers/staging/line6/variax.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*/
Expand Down Expand Up @@ -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);
}
1 change: 0 additions & 1 deletion drivers/staging/line6/variax.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit d29b854

Please sign in to comment.