aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-11-30 16:42:07 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:16:58 -0500
commit8350e1551c27ee784ded579fd224846972d4b0d3 (patch)
treebfe14238becb6ba4c10e08151a8345e9e09fc71a /drivers
parent9124544320bd36d5aa21769d17a5781ba729aebf (diff)
[media] media: Remove unnecessary casts of usb_get_intfdata
Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/siano/smsusb.c9
-rw-r--r--drivers/media/rc/imon.c2
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c
index 50d4338610e0..0b8da57cf4c3 100644
--- 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)
288 288
289static void smsusb_term_device(struct usb_interface *intf) 289static void smsusb_term_device(struct usb_interface *intf)
290{ 290{
291 struct smsusb_device_t *dev = 291 struct smsusb_device_t *dev = usb_get_intfdata(intf);
292 (struct smsusb_device_t *) usb_get_intfdata(intf);
293 292
294 if (dev) { 293 if (dev) {
295 smsusb_stop_streaming(dev); 294 smsusb_stop_streaming(dev);
@@ -445,8 +444,7 @@ static void smsusb_disconnect(struct usb_interface *intf)
445 444
446static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg) 445static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg)
447{ 446{
448 struct smsusb_device_t *dev = 447 struct smsusb_device_t *dev = usb_get_intfdata(intf);
449 (struct smsusb_device_t *)usb_get_intfdata(intf);
450 printk(KERN_INFO "%s: Entering status %d.\n", __func__, msg.event); 448 printk(KERN_INFO "%s: Entering status %d.\n", __func__, msg.event);
451 smsusb_stop_streaming(dev); 449 smsusb_stop_streaming(dev);
452 return 0; 450 return 0;
@@ -455,8 +453,7 @@ static int smsusb_suspend(struct usb_interface *intf, pm_message_t msg)
455static int smsusb_resume(struct usb_interface *intf) 453static int smsusb_resume(struct usb_interface *intf)
456{ 454{
457 int rc, i; 455 int rc, i;
458 struct smsusb_device_t *dev = 456 struct smsusb_device_t *dev = usb_get_intfdata(intf);
459 (struct smsusb_device_t *)usb_get_intfdata(intf);
460 struct usb_device *udev = interface_to_usbdev(intf); 457 struct usb_device *udev = interface_to_usbdev(intf);
461 458
462 printk(KERN_INFO "%s: Entering.\n", __func__); 459 printk(KERN_INFO "%s: Entering.\n", __func__);
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c
index de9dc0e202d5..6811512b4e83 100644
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
@@ -2274,7 +2274,7 @@ static int __devinit imon_probe(struct usb_interface *interface,
2274 mutex_lock(&driver_lock); 2274 mutex_lock(&driver_lock);
2275 2275
2276 first_if = usb_ifnum_to_if(usbdev, 0); 2276 first_if = usb_ifnum_to_if(usbdev, 0);
2277 first_if_ctx = (struct imon_context *)usb_get_intfdata(first_if); 2277 first_if_ctx = usb_get_intfdata(first_if);
2278 2278
2279 if (ifnum == 0) { 2279 if (ifnum == 0) {
2280 ictx = imon_init_intf0(interface); 2280 ictx = imon_init_intf0(interface);