Loading drivers/net/usb/lan78xx.c +42 −38 Original line number Diff line number Diff line Loading @@ -382,7 +382,7 @@ struct lan78xx_net { struct usb_anchor deferred; struct mutex phy_mutex; /* for phy access */ unsigned pipe_in, pipe_out, pipe_intr; unsigned int pipe_in, pipe_out, pipe_intr; u32 hard_mtu; /* count any extra framing */ size_t rx_urb_size; /* size for rx urbs */ Loading @@ -392,7 +392,7 @@ struct lan78xx_net { wait_queue_head_t *wait; unsigned char suspend_count; unsigned maxpacket; unsigned int maxpacket; struct timer_list delay; struct timer_list stat_monitor; Loading Loading @@ -515,10 +515,11 @@ static int lan78xx_read_stats(struct lan78xx_net *dev, return ret; } #define check_counter_rollover(struct1, dev_stats, member) { \ if (struct1->member < dev_stats.saved.member) \ dev_stats.rollover_count.member++; \ } #define check_counter_rollover(struct1, dev_stats, member) \ do { \ if ((struct1)->member < (dev_stats).saved.member) \ (dev_stats).rollover_count.member++; \ } while (0) static void lan78xx_check_stat_rollover(struct lan78xx_net *dev, struct lan78xx_statstage *stats) Loading Loading @@ -959,7 +960,7 @@ static int lan78xx_dataport_wait_not_busy(struct lan78xx_net *dev) usleep_range(40, 100); } netdev_warn(dev->net, "lan78xx_dataport_wait_not_busy timed out"); netdev_warn(dev->net, "%s timed out", __func__); return -EIO; } Loading Loading @@ -1067,9 +1068,10 @@ static void lan78xx_set_multicast(struct net_device *netdev) for (i = 0; i < DP_SEL_VHF_HASH_LEN; i++) pdata->mchash_table[i] = 0; /* pfilter_table[0] has own HW address */ for (i = 1; i < NUM_OF_MAF; i++) { pdata->pfilter_table[i][0] = pdata->pfilter_table[i][0] = 0; pdata->pfilter_table[i][1] = 0; } Loading Loading @@ -1264,10 +1266,11 @@ static void lan78xx_status(struct lan78xx_net *dev, struct urb *urb) generic_handle_irq(dev->domain_data.phyirq); local_irq_enable(); } } else } else { netdev_warn(dev->net, "unexpected interrupt: 0x%08x\n", intdata); } } static int lan78xx_ethtool_get_eeprom_len(struct net_device *netdev) { Loading Loading @@ -3356,10 +3359,11 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) if (skb) dev_kfree_skb_any(skb); usb_free_urb(urb); } else } else { netif_dbg(dev, tx_queued, dev->net, "> tx, len %d, type 0x%x\n", length, skb->protocol); } } static void lan78xx_rx_bh(struct lan78xx_net *dev) { Loading Loading @@ -3632,8 +3636,8 @@ static int lan78xx_probe(struct usb_interface *intf, struct net_device *netdev; struct usb_device *udev; int ret; unsigned maxp; unsigned period; unsigned int maxp; unsigned int period; u8 *buf = NULL; udev = interface_to_usbdev(intf); Loading Loading
drivers/net/usb/lan78xx.c +42 −38 Original line number Diff line number Diff line Loading @@ -382,7 +382,7 @@ struct lan78xx_net { struct usb_anchor deferred; struct mutex phy_mutex; /* for phy access */ unsigned pipe_in, pipe_out, pipe_intr; unsigned int pipe_in, pipe_out, pipe_intr; u32 hard_mtu; /* count any extra framing */ size_t rx_urb_size; /* size for rx urbs */ Loading @@ -392,7 +392,7 @@ struct lan78xx_net { wait_queue_head_t *wait; unsigned char suspend_count; unsigned maxpacket; unsigned int maxpacket; struct timer_list delay; struct timer_list stat_monitor; Loading Loading @@ -515,10 +515,11 @@ static int lan78xx_read_stats(struct lan78xx_net *dev, return ret; } #define check_counter_rollover(struct1, dev_stats, member) { \ if (struct1->member < dev_stats.saved.member) \ dev_stats.rollover_count.member++; \ } #define check_counter_rollover(struct1, dev_stats, member) \ do { \ if ((struct1)->member < (dev_stats).saved.member) \ (dev_stats).rollover_count.member++; \ } while (0) static void lan78xx_check_stat_rollover(struct lan78xx_net *dev, struct lan78xx_statstage *stats) Loading Loading @@ -959,7 +960,7 @@ static int lan78xx_dataport_wait_not_busy(struct lan78xx_net *dev) usleep_range(40, 100); } netdev_warn(dev->net, "lan78xx_dataport_wait_not_busy timed out"); netdev_warn(dev->net, "%s timed out", __func__); return -EIO; } Loading Loading @@ -1067,9 +1068,10 @@ static void lan78xx_set_multicast(struct net_device *netdev) for (i = 0; i < DP_SEL_VHF_HASH_LEN; i++) pdata->mchash_table[i] = 0; /* pfilter_table[0] has own HW address */ for (i = 1; i < NUM_OF_MAF; i++) { pdata->pfilter_table[i][0] = pdata->pfilter_table[i][0] = 0; pdata->pfilter_table[i][1] = 0; } Loading Loading @@ -1264,10 +1266,11 @@ static void lan78xx_status(struct lan78xx_net *dev, struct urb *urb) generic_handle_irq(dev->domain_data.phyirq); local_irq_enable(); } } else } else { netdev_warn(dev->net, "unexpected interrupt: 0x%08x\n", intdata); } } static int lan78xx_ethtool_get_eeprom_len(struct net_device *netdev) { Loading Loading @@ -3356,10 +3359,11 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) if (skb) dev_kfree_skb_any(skb); usb_free_urb(urb); } else } else { netif_dbg(dev, tx_queued, dev->net, "> tx, len %d, type 0x%x\n", length, skb->protocol); } } static void lan78xx_rx_bh(struct lan78xx_net *dev) { Loading Loading @@ -3632,8 +3636,8 @@ static int lan78xx_probe(struct usb_interface *intf, struct net_device *netdev; struct usb_device *udev; int ret; unsigned maxp; unsigned period; unsigned int maxp; unsigned int period; u8 *buf = NULL; udev = interface_to_usbdev(intf); Loading