Skip to content

L
linux
Commit 9ceec7d3 authored by John Efstathiades's avatar John Efstathiades Committed by David S. Miller
Browse files
Options

lan78xx: Fix white space and style issues 

Fix white space and code style issues identified by checkpatch.
Signed-off-by: default avatarJohn Efstathiades <john.efstathiades@pebblebay.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fbd029df
Hide whitespace changes
Inline Side-by-side
Showing with 42 additions and 38 deletions
drivers/net/usb/lan78xx.c
View file @ 9ceec7d3
...@@ -382,7 +382,7 @@ struct lan78xx_net { ...@@ -382,7 +382,7 @@ struct lan78xx_net {
struct usb_anchor deferred; struct usb_anchor deferred;
struct mutex phy_mutex; /* for phy access */ 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 */ u32 hard_mtu; /* count any extra framing */
size_t rx_urb_size; /* size for rx urbs */ size_t rx_urb_size; /* size for rx urbs */
...@@ -392,7 +392,7 @@ struct lan78xx_net { ...@@ -392,7 +392,7 @@ struct lan78xx_net {
wait_queue_head_t *wait; wait_queue_head_t *wait;
unsigned char suspend_count; unsigned char suspend_count;
unsigned maxpacket; unsigned int maxpacket;
struct timer_list delay; struct timer_list delay;
struct timer_list stat_monitor; struct timer_list stat_monitor;
...@@ -501,7 +501,7 @@ static int lan78xx_read_stats(struct lan78xx_net *dev, ...@@ -501,7 +501,7 @@ static int lan78xx_read_stats(struct lan78xx_net *dev,
if (likely(ret >= 0)) { if (likely(ret >= 0)) {
src = (u32 *)stats; src = (u32 *)stats;
dst = (u32 *)data; dst = (u32 *)data;
for (i = 0; i < sizeof(*stats)/sizeof(u32); i++) { for (i = 0; i < sizeof(*stats) / sizeof(u32); i++) {
le32_to_cpus(&src[i]); le32_to_cpus(&src[i]);
dst[i] = src[i]; dst[i] = src[i];
} }
...@@ -515,10 +515,11 @@ static int lan78xx_read_stats(struct lan78xx_net *dev, ...@@ -515,10 +515,11 @@ static int lan78xx_read_stats(struct lan78xx_net *dev,
return ret; return ret;
} }
#define check_counter_rollover(struct1, dev_stats, member) { \ #define check_counter_rollover(struct1, dev_stats, member) \
if (struct1->member < dev_stats.saved.member) \ do { \
dev_stats.rollover_count.member++; \ if ((struct1)->member < (dev_stats).saved.member) \
} (dev_stats).rollover_count.member++; \
} while (0)
static void lan78xx_check_stat_rollover(struct lan78xx_net *dev, static void lan78xx_check_stat_rollover(struct lan78xx_net *dev,
struct lan78xx_statstage *stats) struct lan78xx_statstage *stats)
...@@ -844,9 +845,9 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *dev, u32 offset, ...@@ -844,9 +845,9 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *dev, u32 offset,
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
lan78xx_write_reg(dev, OTP_ADDR1, lan78xx_write_reg(dev, OTP_ADDR1,
((offset + i) >> 8) & OTP_ADDR1_15_11); ((offset + i) >> 8) & OTP_ADDR1_15_11);
lan78xx_write_reg(dev, OTP_ADDR2, lan78xx_write_reg(dev, OTP_ADDR2,
((offset + i) & OTP_ADDR2_10_3)); ((offset + i) & OTP_ADDR2_10_3));
lan78xx_write_reg(dev, OTP_FUNC_CMD, OTP_FUNC_CMD_READ_); lan78xx_write_reg(dev, OTP_FUNC_CMD, OTP_FUNC_CMD_READ_);
lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_);
...@@ -900,9 +901,9 @@ static int lan78xx_write_raw_otp(struct lan78xx_net *dev, u32 offset, ...@@ -900,9 +901,9 @@ static int lan78xx_write_raw_otp(struct lan78xx_net *dev, u32 offset,
for (i = 0; i < length; i++) { for (i = 0; i < length; i++) {
lan78xx_write_reg(dev, OTP_ADDR1, lan78xx_write_reg(dev, OTP_ADDR1,
((offset + i) >> 8) & OTP_ADDR1_15_11); ((offset + i) >> 8) & OTP_ADDR1_15_11);
lan78xx_write_reg(dev, OTP_ADDR2, lan78xx_write_reg(dev, OTP_ADDR2,
((offset + i) & OTP_ADDR2_10_3)); ((offset + i) & OTP_ADDR2_10_3));
lan78xx_write_reg(dev, OTP_PRGM_DATA, data[i]); lan78xx_write_reg(dev, OTP_PRGM_DATA, data[i]);
lan78xx_write_reg(dev, OTP_TST_CMD, OTP_TST_CMD_PRGVRFY_); lan78xx_write_reg(dev, OTP_TST_CMD, OTP_TST_CMD_PRGVRFY_);
lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_);
...@@ -959,7 +960,7 @@ static int lan78xx_dataport_wait_not_busy(struct lan78xx_net *dev) ...@@ -959,7 +960,7 @@ static int lan78xx_dataport_wait_not_busy(struct lan78xx_net *dev)
usleep_range(40, 100); 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; return -EIO;
} }
...@@ -972,7 +973,7 @@ static int lan78xx_dataport_write(struct lan78xx_net *dev, u32 ram_select, ...@@ -972,7 +973,7 @@ static int lan78xx_dataport_write(struct lan78xx_net *dev, u32 ram_select,
int i, ret; int i, ret;
if (usb_autopm_get_interface(dev->intf) < 0) if (usb_autopm_get_interface(dev->intf) < 0)
return 0; return 0;
mutex_lock(&pdata->dataport_mutex); mutex_lock(&pdata->dataport_mutex);
...@@ -1045,9 +1046,9 @@ static void lan78xx_deferred_multicast_write(struct work_struct *param) ...@@ -1045,9 +1046,9 @@ static void lan78xx_deferred_multicast_write(struct work_struct *param)
for (i = 1; i < NUM_OF_MAF; i++) { for (i = 1; i < NUM_OF_MAF; i++) {
lan78xx_write_reg(dev, MAF_HI(i), 0); lan78xx_write_reg(dev, MAF_HI(i), 0);
lan78xx_write_reg(dev, MAF_LO(i), lan78xx_write_reg(dev, MAF_LO(i),
pdata->pfilter_table[i][1]); pdata->pfilter_table[i][1]);
lan78xx_write_reg(dev, MAF_HI(i), lan78xx_write_reg(dev, MAF_HI(i),
pdata->pfilter_table[i][0]); pdata->pfilter_table[i][0]);
} }
lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl);
...@@ -1066,11 +1067,12 @@ static void lan78xx_set_multicast(struct net_device *netdev) ...@@ -1066,11 +1067,12 @@ static void lan78xx_set_multicast(struct net_device *netdev)
RFE_CTL_DA_PERFECT_ | RFE_CTL_MCAST_HASH_); RFE_CTL_DA_PERFECT_ | RFE_CTL_MCAST_HASH_);
for (i = 0; i < DP_SEL_VHF_HASH_LEN; i++) for (i = 0; i < DP_SEL_VHF_HASH_LEN; i++)
pdata->mchash_table[i] = 0; pdata->mchash_table[i] = 0;
/* pfilter_table[0] has own HW address */ /* pfilter_table[0] has own HW address */
for (i = 1; i < NUM_OF_MAF; i++) { 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; pdata->pfilter_table[i][1] = 0;
} }
pdata->rfe_ctl |= RFE_CTL_BCAST_EN_; pdata->rfe_ctl |= RFE_CTL_BCAST_EN_;
...@@ -1264,9 +1266,10 @@ static void lan78xx_status(struct lan78xx_net *dev, struct urb *urb) ...@@ -1264,9 +1266,10 @@ static void lan78xx_status(struct lan78xx_net *dev, struct urb *urb)
generic_handle_irq(dev->domain_data.phyirq); generic_handle_irq(dev->domain_data.phyirq);
local_irq_enable(); local_irq_enable();
} }
} else } else {
netdev_warn(dev->net, netdev_warn(dev->net,
"unexpected interrupt: 0x%08x\n", intdata); "unexpected interrupt: 0x%08x\n", intdata);
}
} }
static int lan78xx_ethtool_get_eeprom_len(struct net_device *netdev) static int lan78xx_ethtool_get_eeprom_len(struct net_device *netdev)
...@@ -1355,7 +1358,7 @@ static void lan78xx_get_wol(struct net_device *netdev, ...@@ -1355,7 +1358,7 @@ static void lan78xx_get_wol(struct net_device *netdev,
struct lan78xx_priv *pdata = (struct lan78xx_priv *)(dev->data[0]); struct lan78xx_priv *pdata = (struct lan78xx_priv *)(dev->data[0]);
if (usb_autopm_get_interface(dev->intf) < 0) if (usb_autopm_get_interface(dev->intf) < 0)
return; return;
ret = lan78xx_read_reg(dev, USB_CFG0, &buf); ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
if (unlikely(ret < 0)) { if (unlikely(ret < 0)) {
...@@ -2003,7 +2006,7 @@ static int lan8835_fixup(struct phy_device *phydev) ...@@ -2003,7 +2006,7 @@ static int lan8835_fixup(struct phy_device *phydev)
/* RGMII MAC TXC Delay Enable */ /* RGMII MAC TXC Delay Enable */
lan78xx_write_reg(dev, MAC_RGMII_ID, lan78xx_write_reg(dev, MAC_RGMII_ID,
MAC_RGMII_ID_TXC_DELAY_EN_); MAC_RGMII_ID_TXC_DELAY_EN_);
/* RGMII TX DLL Tune Adjust */ /* RGMII TX DLL Tune Adjust */
lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00); lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00);
...@@ -3356,9 +3359,10 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev) ...@@ -3356,9 +3359,10 @@ static void lan78xx_tx_bh(struct lan78xx_net *dev)
if (skb) if (skb)
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
usb_free_urb(urb); usb_free_urb(urb);
} else } else {
netif_dbg(dev, tx_queued, dev->net, netif_dbg(dev, tx_queued, dev->net,
"> tx, len %d, type 0x%x\n", length, skb->protocol); "> tx, len %d, type 0x%x\n", length, skb->protocol);
}
} }
static void lan78xx_rx_bh(struct lan78xx_net *dev) static void lan78xx_rx_bh(struct lan78xx_net *dev)
...@@ -3459,7 +3463,7 @@ static void lan78xx_delayedwork(struct work_struct *work) ...@@ -3459,7 +3463,7 @@ static void lan78xx_delayedwork(struct work_struct *work)
unlink_urbs(dev, &dev->rxq); unlink_urbs(dev, &dev->rxq);
status = usb_autopm_get_interface(dev->intf); status = usb_autopm_get_interface(dev->intf);
if (status < 0) if (status < 0)
goto fail_halt; goto fail_halt;
status = usb_clear_halt(dev->udev, dev->pipe_in); status = usb_clear_halt(dev->udev, dev->pipe_in);
usb_autopm_put_interface(dev->intf); usb_autopm_put_interface(dev->intf);
if (status < 0 && if (status < 0 &&
...@@ -3632,8 +3636,8 @@ static int lan78xx_probe(struct usb_interface *intf, ...@@ -3632,8 +3636,8 @@ static int lan78xx_probe(struct usb_interface *intf,
struct net_device *netdev; struct net_device *netdev;
struct usb_device *udev; struct usb_device *udev;
int ret; int ret;
unsigned maxp; unsigned int maxp;
unsigned period; unsigned int period;
u8 *buf = NULL; u8 *buf = NULL;
udev = interface_to_usbdev(intf); udev = interface_to_usbdev(intf);
...@@ -3858,10 +3862,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) ...@@ -3858,10 +3862,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol)
/* set WUF_CFG & WUF_MASK for IPv4 Multicast */ /* set WUF_CFG & WUF_MASK for IPv4 Multicast */
crc = lan78xx_wakeframe_crc16(ipv4_multicast, 3); crc = lan78xx_wakeframe_crc16(ipv4_multicast, 3);
lan78xx_write_reg(dev, WUF_CFG(mask_index), lan78xx_write_reg(dev, WUF_CFG(mask_index),
WUF_CFGX_EN_ | WUF_CFGX_EN_ |
WUF_CFGX_TYPE_MCAST_ | WUF_CFGX_TYPE_MCAST_ |
(0 << WUF_CFGX_OFFSET_SHIFT_) | (0 << WUF_CFGX_OFFSET_SHIFT_) |
(crc & WUF_CFGX_CRC16_MASK_)); (crc & WUF_CFGX_CRC16_MASK_));
lan78xx_write_reg(dev, WUF_MASK0(mask_index), 7); lan78xx_write_reg(dev, WUF_MASK0(mask_index), 7);
lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0);
...@@ -3872,10 +3876,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) ...@@ -3872,10 +3876,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol)
/* for IPv6 Multicast */ /* for IPv6 Multicast */
crc = lan78xx_wakeframe_crc16(ipv6_multicast, 2); crc = lan78xx_wakeframe_crc16(ipv6_multicast, 2);
lan78xx_write_reg(dev, WUF_CFG(mask_index), lan78xx_write_reg(dev, WUF_CFG(mask_index),
WUF_CFGX_EN_ | WUF_CFGX_EN_ |
WUF_CFGX_TYPE_MCAST_ | WUF_CFGX_TYPE_MCAST_ |
(0 << WUF_CFGX_OFFSET_SHIFT_) | (0 << WUF_CFGX_OFFSET_SHIFT_) |
(crc & WUF_CFGX_CRC16_MASK_)); (crc & WUF_CFGX_CRC16_MASK_));
lan78xx_write_reg(dev, WUF_MASK0(mask_index), 3); lan78xx_write_reg(dev, WUF_MASK0(mask_index), 3);
lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0);
...@@ -3902,10 +3906,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) ...@@ -3902,10 +3906,10 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol)
*/ */
crc = lan78xx_wakeframe_crc16(arp_type, 2); crc = lan78xx_wakeframe_crc16(arp_type, 2);
lan78xx_write_reg(dev, WUF_CFG(mask_index), lan78xx_write_reg(dev, WUF_CFG(mask_index),
WUF_CFGX_EN_ | WUF_CFGX_EN_ |
WUF_CFGX_TYPE_ALL_ | WUF_CFGX_TYPE_ALL_ |
(0 << WUF_CFGX_OFFSET_SHIFT_) | (0 << WUF_CFGX_OFFSET_SHIFT_) |
(crc & WUF_CFGX_CRC16_MASK_)); (crc & WUF_CFGX_CRC16_MASK_));
lan78xx_write_reg(dev, WUF_MASK0(mask_index), 0x3000); lan78xx_write_reg(dev, WUF_MASK0(mask_index), 0x3000);
lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0);
...@@ -4050,7 +4054,7 @@ static int lan78xx_resume(struct usb_interface *intf) ...@@ -4050,7 +4054,7 @@ static int lan78xx_resume(struct usb_interface *intf)
if (!--dev->suspend_count) { if (!--dev->suspend_count) {
/* resume interrupt URBs */ /* resume interrupt URBs */
if (dev->urb_intr && test_bit(EVENT_DEV_OPEN, &dev->flags)) if (dev->urb_intr && test_bit(EVENT_DEV_OPEN, &dev->flags))
usb_submit_urb(dev->urb_intr, GFP_NOIO); usb_submit_urb(dev->urb_intr, GFP_NOIO);
spin_lock_irq(&dev->txq.lock); spin_lock_irq(&dev->txq.lock);
while ((res = usb_get_from_anchor(&dev->deferred))) { while ((res = usb_get_from_anchor(&dev->deferred))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7