ALSA: line6: Drop interface argument from private_init and disconnect callbacks

The interface argument is used just for retrieving the assigned
device, which can be already found in line6->ifcdev.  Drop them from
the callbacks.  Also, pass the usb id to private_init so that the
driver can deal with it there.  This is a preliminary work for the
further cleanup to move the whole allocation into driver.c.

Tested-by: Chris Rorvick <chris@rorvick.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/usb/line6/podhd.c b/sound/usb/line6/podhd.c
index 59abbd92624e..21d7edcfa272 100644
--- a/sound/usb/line6/podhd.c
+++ b/sound/usb/line6/podhd.c
@@ -87,8 +87,8 @@ static struct line6_pcm_properties podhd_pcm_properties = {
 /*
         Try to init POD HD device.
 */
-static int podhd_init(struct usb_interface *interface,
-                      struct usb_line6 *line6)
+static int podhd_init(struct usb_line6 *line6,
+                      const struct usb_device_id *id)
 {
         int err;
 
@@ -182,7 +182,7 @@ static int podhd_probe(struct usb_interface *interface,
         podhd = kzalloc(sizeof(*podhd), GFP_KERNEL);
         if (!podhd)
                 return -ENODEV;
-        return line6_probe(interface, &podhd->line6,
+        return line6_probe(interface, id, &podhd->line6,
                            &podhd_properties_table[id->driver_info],
                            podhd_init);
 }