diff options
author | Malcolm Priestley <tvboxspy@gmail.com> | 2020-03-02 21:16:23 +0000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-04 07:52:32 +0100 |
commit | 05f665dd0faa390e9723d3cbcece311df42653b9 (patch) | |
tree | ce4b61d6b6c6cef16eed39dbab50df115dd89084 /drivers/staging | |
parent | 0fd349fd1d2247be926a2af13969be6ae855a2b1 (diff) | |
download | linux-05f665dd0faa390e9723d3cbcece311df42653b9.tar.bz2 |
staging: vt6656: Remove function vnt_int_process_data.
call vnt_start_interrupt_urb directly from vnt_start.
Move debug message to vnt_start_interrupt_urb.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/dff3a1d0-4d24-d9ea-2a15-c81fd544bc79@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/vt6656/int.c | 11 | ||||
-rw-r--r-- | drivers/staging/vt6656/int.h | 1 | ||||
-rw-r--r-- | drivers/staging/vt6656/main_usb.c | 2 | ||||
-rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 2 |
4 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/vt6656/int.c b/drivers/staging/vt6656/int.c index fcf92cd1234b..139be3f845c3 100644 --- a/drivers/staging/vt6656/int.c +++ b/drivers/staging/vt6656/int.c @@ -23,17 +23,6 @@ #include "power.h" #include "usbpipe.h" -int vnt_int_start_interrupt(struct vnt_private *priv) -{ - int ret = 0; - - dev_dbg(&priv->usb->dev, "---->Interrupt Polling Thread\n"); - - ret = vnt_start_interrupt_urb(priv); - - return ret; -} - static int vnt_int_report_rate(struct vnt_private *priv, u8 pkt_no, u8 tsr) { struct vnt_usb_send_context *context; diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h index 8a6d60569ceb..0b7473a7f190 100644 --- a/drivers/staging/vt6656/int.h +++ b/drivers/staging/vt6656/int.h @@ -41,7 +41,6 @@ struct vnt_interrupt_data { u8 sw[2]; } __packed; -int vnt_int_start_interrupt(struct vnt_private *priv); void vnt_int_process_data(struct vnt_private *priv); #endif /* __INT_H__ */ diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 9135aad0863d..a22f88b1f5e9 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -549,7 +549,7 @@ static int vnt_start(struct ieee80211_hw *hw) priv->int_interval = 1; /* bInterval is set to 1 */ - ret = vnt_int_start_interrupt(priv); + ret = vnt_start_interrupt_urb(priv); if (ret) goto free_all; diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index e93c2175543f..0e29dc2f4b0d 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -176,6 +176,8 @@ int vnt_start_interrupt_urb(struct vnt_private *priv) { int ret = 0; + dev_dbg(&priv->usb->dev, "---->Interrupt Polling Thread\n"); + if (priv->int_buf.in_use) { ret = -EBUSY; goto err; |