libertas: make lbs_cmd() usage nicer

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / libertas / if_usb.c

diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 141d185ac01bb9642ae0fa3187dc4b9ea0b54c28..8ff57a6f251fb75d307069d66ae2151463b9db11 100644 (file)
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -13,6 +13,7 @@
 #include "decl.h"
 #include "defs.h"
 #include "dev.h"
+#include "cmd.h"
 #include "if_usb.h"
 
 #define MESSAGE_HEADER_LEN     4
@@ -108,7 +109,7 @@ static void if_usb_set_boot2_ver(struct lbs_private *priv)
        b2_cmd.action = 0;
        b2_cmd.version = priv->boot2_version;
 
-       if (lbs_cmd(priv, CMD_SET_BOOT2_VER, &b2_cmd, sizeof(b2_cmd), NULL))
+       if (lbs_cmd(priv, CMD_SET_BOOT2_VER, b2_cmd, NULL, 0))
                lbs_deb_usb("Setting boot2 version failed\n");
 }
 
@@ -632,7 +633,7 @@ static inline void process_cmdrequest(int recvlength, u8 *recvbuff,
               priv->upld_len);
 
        kfree_skb(skb);
-       lbs_interrupt(priv->dev);
+       lbs_interrupt(priv);
        spin_unlock(&priv->driver_lock);
 
        lbs_deb_usbd(&cardp->udev->dev,
@@ -705,7 +706,7 @@ static void if_usb_receive(struct urb *urb)
                cardp->usb_event_cause <<= 3;
                cardp->usb_int_cause |= MRVDRV_CARDEVENT;
                kfree_skb(skb);
-               lbs_interrupt(priv->dev);
+               lbs_interrupt(priv);
                spin_unlock(&priv->driver_lock);
                goto rx_exit;
        default: