diff options
author | Florian Westphal <fw@strlen.de> | 2016-05-03 10:33:13 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-05-04 14:16:49 -0400 |
commit | 860e9538a9482bb84589f7d0718a7e6d0a944d58 (patch) | |
tree | 0bb6a166267299aadb498c2d857f38233d615809 /drivers/net/can | |
parent | ba162f8eed61a7e71e26455ce1cff5b5898a3579 (diff) |
treewide: replace dev->trans_start update with helper
Replace all trans_start updates with netif_trans_update helper.
change was done via spatch:
struct net_device *d;
@@
- d->trans_start = jiffies
+ netif_trans_update(d)
Compile tested only.
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: linux-xtensa@linux-xtensa.org
Cc: linux1394-devel@lists.sourceforge.net
Cc: linux-rdma@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: MPT-FusionLinux.pdl@broadcom.com
Cc: linux-scsi@vger.kernel.org
Cc: linux-can@vger.kernel.org
Cc: linux-parisc@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Cc: linux-hams@vger.kernel.org
Cc: linux-usb@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: linux-s390@vger.kernel.org
Cc: devel@driverdev.osuosl.org
Cc: b.a.t.m.a.n@lists.open-mesh.org
Cc: linux-bluetooth@vger.kernel.org
Signed-off-by: Florian Westphal <fw@strlen.de>
Acked-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Acked-by: Mugunthan V N <mugunthanvnm@ti.com>
Acked-by: Antonio Quartulli <a@unstable.cc>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can')
-rw-r--r-- | drivers/net/can/mscan/mscan.c | 4 | ||||
-rw-r--r-- | drivers/net/can/usb/ems_usb.c | 4 | ||||
-rw-r--r-- | drivers/net/can/usb/esd_usb2.c | 4 | ||||
-rw-r--r-- | drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c index e36b7400d5cc..acb708fc1463 100644 --- a/drivers/net/can/mscan/mscan.c +++ b/drivers/net/can/mscan/mscan.c | |||
@@ -276,7 +276,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
276 | out_8(®s->cantflg, 1 << buf_id); | 276 | out_8(®s->cantflg, 1 << buf_id); |
277 | 277 | ||
278 | if (!test_bit(F_TX_PROGRESS, &priv->flags)) | 278 | if (!test_bit(F_TX_PROGRESS, &priv->flags)) |
279 | dev->trans_start = jiffies; | 279 | netif_trans_update(dev); |
280 | 280 | ||
281 | list_add_tail(&priv->tx_queue[buf_id].list, &priv->tx_head); | 281 | list_add_tail(&priv->tx_queue[buf_id].list, &priv->tx_head); |
282 | 282 | ||
@@ -469,7 +469,7 @@ static irqreturn_t mscan_isr(int irq, void *dev_id) | |||
469 | clear_bit(F_TX_PROGRESS, &priv->flags); | 469 | clear_bit(F_TX_PROGRESS, &priv->flags); |
470 | priv->cur_pri = 0; | 470 | priv->cur_pri = 0; |
471 | } else { | 471 | } else { |
472 | dev->trans_start = jiffies; | 472 | netif_trans_update(dev); |
473 | } | 473 | } |
474 | 474 | ||
475 | if (!test_bit(F_TX_WAIT_ALL, &priv->flags)) | 475 | if (!test_bit(F_TX_WAIT_ALL, &priv->flags)) |
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index 3400fd1cada7..71f0e791355b 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c | |||
@@ -521,7 +521,7 @@ static void ems_usb_write_bulk_callback(struct urb *urb) | |||
521 | if (urb->status) | 521 | if (urb->status) |
522 | netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status); | 522 | netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status); |
523 | 523 | ||
524 | netdev->trans_start = jiffies; | 524 | netif_trans_update(netdev); |
525 | 525 | ||
526 | /* transmission complete interrupt */ | 526 | /* transmission complete interrupt */ |
527 | netdev->stats.tx_packets++; | 527 | netdev->stats.tx_packets++; |
@@ -835,7 +835,7 @@ static netdev_tx_t ems_usb_start_xmit(struct sk_buff *skb, struct net_device *ne | |||
835 | stats->tx_dropped++; | 835 | stats->tx_dropped++; |
836 | } | 836 | } |
837 | } else { | 837 | } else { |
838 | netdev->trans_start = jiffies; | 838 | netif_trans_update(netdev); |
839 | 839 | ||
840 | /* Slow down tx path */ | 840 | /* Slow down tx path */ |
841 | if (atomic_read(&dev->active_tx_urbs) >= MAX_TX_URBS || | 841 | if (atomic_read(&dev->active_tx_urbs) >= MAX_TX_URBS || |
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index 113e64fcd73b..784a9002fbb9 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c | |||
@@ -480,7 +480,7 @@ static void esd_usb2_write_bulk_callback(struct urb *urb) | |||
480 | if (urb->status) | 480 | if (urb->status) |
481 | netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status); | 481 | netdev_info(netdev, "Tx URB aborted (%d)\n", urb->status); |
482 | 482 | ||
483 | netdev->trans_start = jiffies; | 483 | netif_trans_update(netdev); |
484 | } | 484 | } |
485 | 485 | ||
486 | static ssize_t show_firmware(struct device *d, | 486 | static ssize_t show_firmware(struct device *d, |
@@ -820,7 +820,7 @@ static netdev_tx_t esd_usb2_start_xmit(struct sk_buff *skb, | |||
820 | goto releasebuf; | 820 | goto releasebuf; |
821 | } | 821 | } |
822 | 822 | ||
823 | netdev->trans_start = jiffies; | 823 | netif_trans_update(netdev); |
824 | 824 | ||
825 | /* | 825 | /* |
826 | * Release our reference to this URB, the USB core will eventually free | 826 | * Release our reference to this URB, the USB core will eventually free |
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_core.c b/drivers/net/can/usb/peak_usb/pcan_usb_core.c index 5a2e341a6d1e..bfb91d8fa460 100644 --- a/drivers/net/can/usb/peak_usb/pcan_usb_core.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_core.c | |||
@@ -274,7 +274,7 @@ static void peak_usb_write_bulk_callback(struct urb *urb) | |||
274 | netdev->stats.tx_bytes += context->data_len; | 274 | netdev->stats.tx_bytes += context->data_len; |
275 | 275 | ||
276 | /* prevent tx timeout */ | 276 | /* prevent tx timeout */ |
277 | netdev->trans_start = jiffies; | 277 | netif_trans_update(netdev); |
278 | break; | 278 | break; |
279 | 279 | ||
280 | default: | 280 | default: |
@@ -373,7 +373,7 @@ static netdev_tx_t peak_usb_ndo_start_xmit(struct sk_buff *skb, | |||
373 | stats->tx_dropped++; | 373 | stats->tx_dropped++; |
374 | } | 374 | } |
375 | } else { | 375 | } else { |
376 | netdev->trans_start = jiffies; | 376 | netif_trans_update(netdev); |
377 | 377 | ||
378 | /* slow down tx path */ | 378 | /* slow down tx path */ |
379 | if (atomic_read(&dev->active_tx_urbs) >= PCAN_USB_MAX_TX_URBS) | 379 | if (atomic_read(&dev->active_tx_urbs) >= PCAN_USB_MAX_TX_URBS) |