diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2020-02-29 19:29:55 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-03-04 07:52:31 +0100 |
| commit | 2812ab8963e632617487b037fe7d10f2694ca1c7 (patch) | |
| tree | a7f602662d65122c0a8b2a1abde848b5a52df2ce | |
| parent | 3b4922deaf3759730412c8e57b8fee9243f8641d (diff) | |
staging: vt6656: Remove STATUS enums from TX path
Returning standard error code or status variable.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Link: https://lore.kernel.org/r/21bf299b-63e0-9f65-c7db-6e0b72e0f1d8@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6656/device.h | 9 | ||||
| -rw-r--r-- | drivers/staging/vt6656/rxtx.c | 4 | ||||
| -rw-r--r-- | drivers/staging/vt6656/usbpipe.c | 5 |
3 files changed, 4 insertions, 14 deletions
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index da868adba7c9..5c9991415432 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -256,15 +256,6 @@ struct vnt_interrupt_buffer { bool in_use; }; -/*++ NDIS related */ - -enum { - STATUS_SUCCESS = 0, - STATUS_FAILURE, - STATUS_RESOURCES, - STATUS_PENDING, -}; - /* flags for options */ #define DEVICE_FLAGS_UNPLUG 0 #define DEVICE_FLAGS_DISCONNECTED 1 diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 1003808ac4ad..9439d190f431 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -704,7 +704,7 @@ int vnt_tx_packet(struct vnt_private *priv, struct sk_buff *skb) spin_lock_irqsave(&priv->lock, flags); - if (vnt_tx_context(priv, tx_context) != STATUS_PENDING) { + if (vnt_tx_context(priv, tx_context)) { spin_unlock_irqrestore(&priv->lock, flags); return -EIO; } @@ -797,7 +797,7 @@ static int vnt_beacon_xmit(struct vnt_private *priv, struct sk_buff *skb) spin_lock_irqsave(&priv->lock, flags); - if (vnt_tx_context(priv, context) != STATUS_PENDING) + if (vnt_tx_context(priv, context)) ieee80211_free_txskb(priv->hw, context->skb); spin_unlock_irqrestore(&priv->lock, flags); diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index 7bfccc48a366..e93c2175543f 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -317,7 +317,7 @@ int vnt_tx_context(struct vnt_private *priv, if (test_bit(DEVICE_FLAGS_DISCONNECTED, &priv->flags)) { context->in_use = false; - return STATUS_RESOURCES; + return -ENODEV; } usb_fill_bulk_urb(urb, @@ -333,8 +333,7 @@ int vnt_tx_context(struct vnt_private *priv, dev_dbg(&priv->usb->dev, "Submit Tx URB failed %d\n", status); context->in_use = false; - return STATUS_FAILURE; } - return STATUS_PENDING; + return status; } |