Skip to content

Commit

Permalink
net: prepare usb net drivers for addition of status as a parameter
Browse files Browse the repository at this point in the history 
USB is going to switch the signature of the callbacks to
void callback(struct urb *urb, int status)
This patch will ease the transition.

Signed-off-by: Oliver Neukum <oneukum@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Oliver Neukum authored and David S. Miller committed Dec 19, 2008
1 parent ab5024a commit c94cb31
Show file tree
Hide file tree
Showing 8 changed files with 83 additions and 66 deletions.
5 changes: 3 additions & 2 deletions drivers/net/usb/asix.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,11 @@ static int asix_write_cmd(struct usbnet *dev, u8 cmd, u16 value, u16 index,
static void asix_async_cmd_callback(struct urb *urb)
{
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
int status = urb->status;

if (urb->status < 0)
if (status < 0)
printk(KERN_DEBUG "asix_async_cmd_callback() failed with %d",
urb->status);
status);

kfree(req);
usb_free_urb(urb);
Expand Down
41 changes: 22 additions & 19 deletions drivers/net/usb/catc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,14 +229,15 @@ static void catc_rx_done(struct urb *urb)
u8 *pkt_start = urb->transfer_buffer;
struct sk_buff *skb;
int pkt_len, pkt_offset = 0;
int status = urb->status;

if (!catc->is_f5u011) {
clear_bit(RX_RUNNING, &catc->flags);
pkt_offset = 2;
}

if (urb->status) {
dbg("rx_done, status %d, length %d", urb->status, urb->actual_length);
if (status) {
dbg("rx_done, status %d, length %d", status, urb->actual_length);
return;
}

Expand Down Expand Up @@ -273,12 +274,12 @@ static void catc_rx_done(struct urb *urb)

if (catc->is_f5u011) {
if (atomic_read(&catc->recq_sz)) {
int status;
int state;
atomic_dec(&catc->recq_sz);
dbg("getting extra packet");
urb->dev = catc->usbdev;
if ((status = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
dbg("submit(rx_urb) status %d", status);
if ((state = usb_submit_urb(urb, GFP_ATOMIC)) < 0) {
dbg("submit(rx_urb) status %d", state);
}
} else {
clear_bit(RX_RUNNING, &catc->flags);
Expand All @@ -290,8 +291,9 @@ static void catc_irq_done(struct urb *urb)
{
struct catc *catc = urb->context;
u8 *data = urb->transfer_buffer;
int status;
int status = urb->status;
unsigned int hasdata = 0, linksts = LinkNoChange;
int res;

if (!catc->is_f5u011) {
hasdata = data[1] & 0x80;
Expand All @@ -307,7 +309,7 @@ static void catc_irq_done(struct urb *urb)
linksts = LinkBad;
}

switch (urb->status) {
switch (status) {
case 0: /* success */
break;
case -ECONNRESET: /* unlink */
Expand All @@ -316,7 +318,7 @@ static void catc_irq_done(struct urb *urb)
return;
/* -EPIPE: should clear the halt */
default: /* error */
dbg("irq_done, status %d, data %02x %02x.", urb->status, data[0], data[1]);
dbg("irq_done, status %d, data %02x %02x.", status, data[0], data[1]);
goto resubmit;
}

Expand All @@ -336,17 +338,17 @@ static void catc_irq_done(struct urb *urb)
atomic_inc(&catc->recq_sz);
} else {
catc->rx_urb->dev = catc->usbdev;
if ((status = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) {
err("submit(rx_urb) status %d", status);
if ((res = usb_submit_urb(catc->rx_urb, GFP_ATOMIC)) < 0) {
err("submit(rx_urb) status %d", res);
}
}
}
resubmit:
status = usb_submit_urb (urb, GFP_ATOMIC);
if (status)
res = usb_submit_urb (urb, GFP_ATOMIC);
if (res)
err ("can't resubmit intr, %s-%s, status %d",
catc->usbdev->bus->bus_name,
catc->usbdev->devpath, status);
catc->usbdev->devpath, res);
}

/*
Expand Down Expand Up @@ -378,9 +380,9 @@ static void catc_tx_done(struct urb *urb)
{
struct catc *catc = urb->context;
unsigned long flags;
int r;
int r, status = urb->status;

if (urb->status == -ECONNRESET) {
if (status == -ECONNRESET) {
dbg("Tx Reset.");
urb->status = 0;
catc->netdev->trans_start = jiffies;
Expand All @@ -390,8 +392,8 @@ static void catc_tx_done(struct urb *urb)
return;
}

if (urb->status) {
dbg("tx_done, status %d, length %d", urb->status, urb->actual_length);
if (status) {
dbg("tx_done, status %d, length %d", status, urb->actual_length);
return;
}

Expand Down Expand Up @@ -502,9 +504,10 @@ static void catc_ctrl_done(struct urb *urb)
struct catc *catc = urb->context;
struct ctrl_queue *q;
unsigned long flags;
int status = urb->status;

if (urb->status)
dbg("ctrl_done, status %d, len %d.", urb->status, urb->actual_length);
if (status)
dbg("ctrl_done, status %d, len %d.", status, urb->actual_length);

spin_lock_irqsave(&catc->ctrl_lock, flags);

Expand Down
5 changes: 3 additions & 2 deletions drivers/net/usb/dm9601.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,11 @@ static int dm_write_reg(struct usbnet *dev, u8 reg, u8 value)
static void dm_write_async_callback(struct urb *urb)
{
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
int status = urb->status;

if (urb->status < 0)
if (status < 0)
printk(KERN_DEBUG "dm_write_async_callback() failed with %d\n",
urb->status);
status);

kfree(req);
usb_free_urb(urb);
Expand Down
17 changes: 10 additions & 7 deletions drivers/net/usb/kaweth.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -516,8 +516,9 @@ static void int_callback(struct urb *u)
{
struct kaweth_device *kaweth = u->context;
int act_state;
int status = u->status;

switch (u->status) {
switch (status) {
case 0: /* success */
break;
case -ECONNRESET: /* unlink */
Expand Down Expand Up @@ -598,6 +599,7 @@ static void kaweth_usb_receive(struct urb *urb)
{
struct kaweth_device *kaweth = urb->context;
struct net_device *net = kaweth->net;
int status = urb->status;

int count = urb->actual_length;
int count2 = urb->transfer_buffer_length;
Expand All @@ -606,7 +608,7 @@ static void kaweth_usb_receive(struct urb *urb)

struct sk_buff *skb;

if(unlikely(urb->status == -ECONNRESET || urb->status == -ESHUTDOWN))
if(unlikely(status == -ECONNRESET || status == -ESHUTDOWN))
/* we are killed - set a flag and wake the disconnect handler */
{
kaweth->end = 1;
Expand All @@ -621,10 +623,10 @@ static void kaweth_usb_receive(struct urb *urb)
}
spin_unlock(&kaweth->device_lock);

if(urb->status && urb->status != -EREMOTEIO && count != 1) {
if(status && status != -EREMOTEIO && count != 1) {
err("%s RX status: %d count: %d packet_len: %d",
net->name,
urb->status,
status,
count,
(int)pkt_len);
kaweth_resubmit_rx_urb(kaweth, GFP_ATOMIC);
Expand Down Expand Up @@ -775,10 +777,11 @@ static void kaweth_usb_transmit_complete(struct urb *urb)
{
struct kaweth_device *kaweth = urb->context;
struct sk_buff *skb = kaweth->tx_skb;
int status = urb->status;

if (unlikely(urb->status != 0))
if (urb->status != -ENOENT)
dbg("%s: TX status %d.", kaweth->net->name, urb->status);
if (unlikely(status != 0))
if (status != -ENOENT)
dbg("%s: TX status %d.", kaweth->net->name, status);

netif_wake_queue(kaweth->net);
dev_kfree_skb_irq(skb);
Expand Down
5 changes: 3 additions & 2 deletions drivers/net/usb/mcs7830.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,11 @@ static int mcs7830_set_reg(struct usbnet *dev, u16 index, u16 size, void *data)
static void mcs7830_async_cmd_callback(struct urb *urb)
{
struct usb_ctrlrequest *req = (struct usb_ctrlrequest *)urb->context;
int status = urb->status;

if (urb->status < 0)
if (status < 0)
printk(KERN_DEBUG "%s() failed with %d\n",
__func__, urb->status);
__func__, status);

kfree(req);
usb_free_urb(urb);
Expand Down
33 changes: 18 additions & 15 deletions drivers/net/usb/pegasus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,12 @@ static int update_eth_regs_async(pegasus_t *);
static void ctrl_callback(struct urb *urb)
{
pegasus_t *pegasus = urb->context;
int status = urb->status;

if (!pegasus)
return;

switch (urb->status) {
switch (status) {
case 0:
if (pegasus->flags & ETH_REGS_CHANGE) {
pegasus->flags &= ~ETH_REGS_CHANGE;
Expand All @@ -119,7 +120,7 @@ static void ctrl_callback(struct urb *urb)
default:
if (netif_msg_drv(pegasus) && printk_ratelimit())
dev_dbg(&pegasus->intf->dev, "%s, status %d\n",
__func__, urb->status);
__func__, status);
}
pegasus->flags &= ~ETH_REGS_CHANGED;
wake_up(&pegasus->ctrl_wait);
Expand Down Expand Up @@ -611,6 +612,7 @@ static void read_bulk_callback(struct urb *urb)
pegasus_t *pegasus = urb->context;
struct net_device *net;
int rx_status, count = urb->actual_length;
int status = urb->status;
u8 *buf = urb->transfer_buffer;
__u16 pkt_len;

Expand All @@ -621,7 +623,7 @@ static void read_bulk_callback(struct urb *urb)
if (!netif_device_present(net) || !netif_running(net))
return;

switch (urb->status) {
switch (status) {
case 0:
break;
case -ETIME:
Expand All @@ -639,11 +641,11 @@ static void read_bulk_callback(struct urb *urb)
case -ECONNRESET:
case -ESHUTDOWN:
if (netif_msg_ifdown(pegasus))
pr_debug("%s: rx unlink, %d\n", net->name, urb->status);
pr_debug("%s: rx unlink, %d\n", net->name, status);
return;
default:
if (netif_msg_rx_err(pegasus))
pr_debug("%s: RX status %d\n", net->name, urb->status);
pr_debug("%s: RX status %d\n", net->name, status);
goto goon;
}

Expand Down Expand Up @@ -769,6 +771,7 @@ static void write_bulk_callback(struct urb *urb)
{
pegasus_t *pegasus = urb->context;
struct net_device *net;
int status = urb->status;

if (!pegasus)
return;
Expand All @@ -778,7 +781,7 @@ static void write_bulk_callback(struct urb *urb)
if (!netif_device_present(net) || !netif_running(net))
return;

switch (urb->status) {
switch (status) {
case -EPIPE:
/* FIXME schedule_work() to clear the tx halt */
netif_stop_queue(net);
Expand All @@ -790,11 +793,11 @@ static void write_bulk_callback(struct urb *urb)
case -ECONNRESET:
case -ESHUTDOWN:
if (netif_msg_ifdown(pegasus))
pr_debug("%s: tx unlink, %d\n", net->name, urb->status);
pr_debug("%s: tx unlink, %d\n", net->name, status);
return;
default:
if (netif_msg_tx_err(pegasus))
pr_info("%s: TX status %d\n", net->name, urb->status);
pr_info("%s: TX status %d\n", net->name, status);
/* FALL THROUGH */
case 0:
break;
Expand All @@ -808,13 +811,13 @@ static void intr_callback(struct urb *urb)
{
pegasus_t *pegasus = urb->context;
struct net_device *net;
int status;
int res, status = urb->status;

if (!pegasus)
return;
net = pegasus->net;

switch (urb->status) {
switch (status) {
case 0:
break;
case -ECONNRESET: /* unlink */
Expand All @@ -827,7 +830,7 @@ static void intr_callback(struct urb *urb)
*/
if (netif_msg_timer(pegasus))
pr_debug("%s: intr status %d\n", net->name,
urb->status);
status);
}

if (urb->actual_length >= 6) {
Expand All @@ -854,12 +857,12 @@ static void intr_callback(struct urb *urb)
pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4];
}

status = usb_submit_urb(urb, GFP_ATOMIC);
if (status == -ENODEV)
res = usb_submit_urb(urb, GFP_ATOMIC);
if (res == -ENODEV)
netif_device_detach(pegasus->net);
if (status && netif_msg_timer(pegasus))
if (res && netif_msg_timer(pegasus))
printk(KERN_ERR "%s: can't resubmit interrupt urb, %d\n",
net->name, status);
net->name, res);
}

static void pegasus_tx_timeout(struct net_device *net)
Expand Down
Loading

0 comments on commit c94cb31

Please sign in to comment.