mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-23 18:07:03 +00:00
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>
This commit is contained in:
parent
204a8ac1db
commit
7c2bb7aff9
@ -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);
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user