libertas: switch USB cardp->priv to 'struct lbs_private *' and resulting fix

Amazing what interesting things the compiler will tell you if you let it
know what types you expect to be passing around.

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index a086653803fe4bf9f82c6767909fc7fbe1e5787b..6cd6c962937de5d33758b7c02f41a3dc9d92b5b1 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -1003,7 +1003,7 @@ static int if_usb_resume(struct usb_interface *intf)
 
        cardp->rx_urb_recall = 0;
 
-       if_usb_submit_rx_urb(cardp->priv);
+       if_usb_submit_rx_urb(cardp);
 
        netif_device_attach(cardp->eth_dev);
        netif_device_attach(priv->mesh_dev);

diff --git a/drivers/net/wireless/libertas/if_usb.h b/drivers/net/wireless/libertas/if_usb.h
index 224c957e292d0fa2aa11e2dc17e600ab5a1cbb98..f028df1d018c6969f3107a5999a3d32dae387e30 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.h
+++ b/drivers/net/wireless/libertas/if_usb.h
@@ -4,6 +4,8 @@
 #include <linux/wait.h>
 #include <linux/timer.h>
 
+struct lbs_private;
+
 /**
   * This file contains definition for USB interface.
   */
@@ -48,7 +50,7 @@ struct usb_card_rec {
        struct net_device *eth_dev;
        struct usb_device *udev;
        struct urb *rx_urb, *tx_urb;
-       void *priv;
+       struct lbs_private *priv;
        struct read_cb_info rinfo;
 
        int bulk_in_size;