Merge branch 'for-next' of git://git.o-hand.com/linux-mfd

[linux-2.6-omap-h63xx.git] / sound / usb / usbaudio.c

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index bbd70d5814a083fff3d130cf5b2be652abd7f2f9..c709b9563226c0b343f98588f4bc91345c5bf185 100644 (file)
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -3709,7 +3709,7 @@ static int usb_audio_probe(struct usb_interface *intf,
        void *chip;
        chip = snd_usb_audio_probe(interface_to_usbdev(intf), intf, id);
        if (chip) {
-               dev_set_drvdata(&intf->dev, chip);
+               usb_set_intfdata(intf, chip);
                return 0;
        } else
                return -EIO;
@@ -3718,13 +3718,13 @@ static int usb_audio_probe(struct usb_interface *intf,
 static void usb_audio_disconnect(struct usb_interface *intf)
 {
        snd_usb_audio_disconnect(interface_to_usbdev(intf),
-                                dev_get_drvdata(&intf->dev));
+                                usb_get_intfdata(intf));
 }
 
 #ifdef CONFIG_PM
 static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
 {
-       struct snd_usb_audio *chip = dev_get_drvdata(&intf->dev);
+       struct snd_usb_audio *chip = usb_get_intfdata(intf);
        struct list_head *p;
        struct snd_usb_stream *as;
 
@@ -3744,7 +3744,7 @@ static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
 
 static int usb_audio_resume(struct usb_interface *intf)
 {
-       struct snd_usb_audio *chip = dev_get_drvdata(&intf->dev);
+       struct snd_usb_audio *chip = usb_get_intfdata(intf);
 
        if (chip == (void *)-1L)
                return 0;