rt2x00: Fix sparse warning on nested container_of()

[linux-2.6] / drivers / net / wireless / rt2x00 / rt2x00usb.c

diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c
index b94c461fbaf923a6c79f4b098396b34130fe27e0..5593b9a83108476adf0635a9b81e82113585aa6c 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00usb.c
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.c
@@ -40,8 +40,7 @@ int rt2x00usb_vendor_request(struct rt2x00_dev *rt2x00dev,
                             void *buffer, const u16 buffer_length,
                             const int timeout)
 {
-       struct usb_device *usb_dev =
-               interface_to_usbdev(to_usb_interface(rt2x00dev->dev));
+       struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
        int status;
        unsigned int i;
        unsigned int pipe =
@@ -162,8 +161,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)
 int rt2x00usb_write_tx_data(struct queue_entry *entry)
 {
        struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
-       struct usb_device *usb_dev =
-               interface_to_usbdev(to_usb_interface(rt2x00dev->dev));
+       struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
        struct queue_entry_priv_usb *entry_priv = entry->priv_data;
        struct skb_frame_desc *skbdesc;
        u32 length;
@@ -319,8 +317,7 @@ EXPORT_SYMBOL_GPL(rt2x00usb_disable_radio);
 void rt2x00usb_init_rxentry(struct rt2x00_dev *rt2x00dev,
                            struct queue_entry *entry)
 {
-       struct usb_device *usb_dev =
-               interface_to_usbdev(to_usb_interface(rt2x00dev->dev));
+       struct usb_device *usb_dev = to_usb_device_intf(rt2x00dev->dev);
        struct queue_entry_priv_usb *entry_priv = entry->priv_data;
 
        usb_fill_bulk_urb(entry_priv->urb, usb_dev,