sound: usxxx: cleanup chip field

[firefly-linux-kernel-4.4.55.git] / sound / usb / usx2y / usX2Yhwdep.c

diff --git a/sound/usb/usx2y/usX2Yhwdep.c b/sound/usb/usx2y/usX2Yhwdep.c
index f3d8f71265dd3bfee1540442184ed226a5f88cf6..1879b72c40f8d0695bd98883021a84be5477f050 100644 (file)
--- a/sound/usb/usx2y/usX2Yhwdep.c
+++ b/sound/usb/usx2y/usX2Yhwdep.c
@@ -53,7 +53,7 @@ static int snd_us428ctls_vm_fault(struct vm_area_struct *area,
        return 0;
 }
 
-static struct vm_operations_struct us428ctls_vm_ops = {
+static const struct vm_operations_struct us428ctls_vm_ops = {
        .fault = snd_us428ctls_vm_fault,
 };
 
@@ -114,7 +114,7 @@ static int snd_usX2Y_hwdep_dsp_status(struct snd_hwdep *hw,
        struct usX2Ydev *us428 = hw->private_data;
        int id = -1;
 
-       switch (le16_to_cpu(us428->chip.dev->descriptor.idProduct)) {
+       switch (le16_to_cpu(us428->dev->descriptor.idProduct)) {
        case USB_ID_US122:
                id = USX2Y_TYPE_122;
                break;
@@ -164,14 +164,14 @@ static int usX2Y_create_usbmidi(struct snd_card *card)
                        .type = QUIRK_MIDI_FIXED_ENDPOINT,
                .data = &quirk_data_2
        };
-       struct usb_device *dev = usX2Y(card)->chip.dev;
+       struct usb_device *dev = usX2Y(card)->dev;
        struct usb_interface *iface = usb_ifnum_to_if(dev, 0);
        struct snd_usb_audio_quirk *quirk =
                le16_to_cpu(dev->descriptor.idProduct) == USB_ID_US428 ?
                &quirk_2 : &quirk_1;
 
        snd_printdd("usX2Y_create_usbmidi \n");
-       return snd_usb_create_midi_interface(&usX2Y(card)->chip, iface, quirk);
+       return snd_usbmidi_create(card, iface, &usX2Y(card)->midi_list, quirk);
 }
 
 static int usX2Y_create_alsa_devices(struct snd_card *card)
@@ -202,7 +202,7 @@ static int snd_usX2Y_hwdep_dsp_load(struct snd_hwdep *hw,
        snd_printdd( "dsp_load %s\n", dsp->name);
 
        if (access_ok(VERIFY_READ, dsp->image, dsp->length)) {
-               struct usb_device* dev = priv->chip.dev;
+               struct usb_device* dev = priv->dev;
                char *buf;
 
                buf = memdup_user(dsp->image, dsp->length);