rtl8712: intf_priv: Replace semaphore lock with completion

The semaphore 'lock' in 'intf_priv' is used as completion,
so convert it to a struct completion type.

Signed-off-by: Binoy Jayan <binoy.jayan@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/osdep_intf.h b/drivers/staging/rtl8712/osdep_intf.h
index aa0ec74af51121442f8100645782ef4f75fcf2e4..5d37e1f951cf58a8473b46d18f90995ca631d623 100644 (file)
--- a/drivers/staging/rtl8712/osdep_intf.h
+++ b/drivers/staging/rtl8712/osdep_intf.h
@@ -36,7 +36,7 @@ struct intf_priv {
        /* when in USB, IO is through interrupt in/out endpoints */
        struct usb_device *udev;
        struct urb *piorw_urb;
-       struct semaphore io_retevt;
+       struct completion io_retevt_comp;
 };
 
 int r871x_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);

diff --git a/drivers/staging/rtl8712/usb_ops_linux.c b/drivers/staging/rtl8712/usb_ops_linux.c
index 6f12345709c25ca83ec8aec4353f54332c4694c8..1af7f5fac5e3eee818529149590a85af4d02ac4b 100644 (file)
--- a/drivers/staging/rtl8712/usb_ops_linux.c
+++ b/drivers/staging/rtl8712/usb_ops_linux.c
@@ -50,7 +50,7 @@ uint r8712_usb_init_intf_priv(struct intf_priv *pintfpriv)
        pintfpriv->piorw_urb = usb_alloc_urb(0, GFP_ATOMIC);
        if (!pintfpriv->piorw_urb)
                return _FAIL;
-       sema_init(&(pintfpriv->io_retevt), 0);
+       init_completion(&pintfpriv->io_retevt_comp);
        return _SUCCESS;
 }
 
@@ -163,7 +163,7 @@ static void usb_write_mem_complete(struct urb *purb)
                else
                        padapter->bSurpriseRemoved = true;
        }
-       up(&pintfpriv->io_retevt);
+       complete(&pintfpriv->io_retevt_comp);
 }
 
 void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
@@ -187,7 +187,7 @@ void r8712_usb_write_mem(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
                          wmem, cnt, usb_write_mem_complete,
                          pio_queue);
        usb_submit_urb(piorw_urb, GFP_ATOMIC);
-       _down_sema(&pintfpriv->io_retevt);
+       wait_for_completion_interruptible(&pintfpriv->io_retevt_comp);
 }
 
 static void r8712_usb_read_port_complete(struct urb *purb)