Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / dvb / siano / smsusb.c

diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 50d4338610e023b3fb76b44867fa8a162bfd3ab7..0b8da57cf4c340fcd0336e5a65ee40f0b47fb8f4 100644 (file)
--- a/drivers/media/dvb/siano/smsusb.c
+++ b/drivers/media/dvb/siano/smsusb.c
@@ -288,8 +288,7 @@ static int smsusb1_setmode(void *context, int mode)
 
 static void smsusb_term_device(struct usb_interface *intf)
 {
-       struct smsusb_device_t *dev =
-               (struct smsusb_device_t *) usb_get_intfdata(intf);
+       struct smsusb_device_t *dev = usb_get_intfdata(intf);
 
        if (dev) {
                smsusb_stop_streaming(dev);
@@ -445,8 +444,7 @@ static void smsusb_disconnect(struct usb_interface *intf)
 
 static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg)
 {
-       struct smsusb_device_t *dev =
-               (struct smsusb_device_t *)usb_get_intfdata(intf);
+       struct smsusb_device_t *dev = usb_get_intfdata(intf);
        printk(KERN_INFO "%s: Entering status %d.\n", __func__, msg.event);
        smsusb_stop_streaming(dev);
        return 0;
@@ -455,8 +453,7 @@ static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg)
 static int smsusb_resume(struct usb_interface *intf)
 {
        int rc, i;
-       struct smsusb_device_t *dev =
-               (struct smsusb_device_t *)usb_get_intfdata(intf);
+       struct smsusb_device_t *dev = usb_get_intfdata(intf);
        struct usb_device *udev = interface_to_usbdev(intf);
 
        printk(KERN_INFO "%s: Entering.\n", __func__);