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

[mv-sheeva.git] / drivers / net / wireless / ath / ar9170 / usb.c

diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
index 5dbb5361fd516808fccc79bc9c2dbd2fc22c5963..d3be6f9816b5c0b6f7dded683eee5f04d26e0765 100644 (file)
--- a/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
@@ -161,8 +161,7 @@ static void ar9170_usb_submit_urb(struct ar9170_usb *aru)
 static void ar9170_usb_tx_urb_complete_frame(struct urb *urb)
 {
        struct sk_buff *skb = urb->context;
-       struct ar9170_usb *aru = (struct ar9170_usb *)
-             usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
+       struct ar9170_usb *aru = usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
 
        if (unlikely(!aru)) {
                dev_kfree_skb_irq(skb);
@@ -219,8 +218,7 @@ free:
 static void ar9170_usb_rx_completed(struct urb *urb)
 {
        struct sk_buff *skb = urb->context;
-       struct ar9170_usb *aru = (struct ar9170_usb *)
-               usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
+       struct ar9170_usb *aru = usb_get_intfdata(usb_ifnum_to_if(urb->dev, 0));
        int err;
 
        if (!aru)