summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb/r8152_shield.c
diff options
context:
space:
mode:
authorhayeswang <hayeswang@realtek.com>2014-03-06 02:07:16 -0500
committerVladislav Zhurba <vzhurba@nvidia.com>2018-02-01 16:58:00 -0500
commit7389c6bf3ebd56e62cfe5d3c784e13a648dcb9e2 (patch)
treedac9b8b839061791a4e88d692f5c4d07bca60c73 /drivers/net/usb/r8152_shield.c
parent445cdafb885b2628dddfb9d2dc5fb100672ded5a (diff)
r8152: deal with the empty line and space
Add or remove some empty lines. Replace the spaces with the tabs. Change-Id: Idc4f84fefd4093a47dd5bdb11105f67942d00892 Signed-off-by: Hayes Wang <hayeswang@realtek.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Aly Hirani <ahirani@nvidia.com> Reviewed-on: http://git-master/r/390289 (cherry picked from commit e606d24a7146568b87b8624ba6a13ba7836bd054) Reviewed-on: http://git-master/r/396891 Reviewed-by: Preetham Chandru <pchandru@nvidia.com> Tested-by: Preetham Chandru <pchandru@nvidia.com> Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Diffstat (limited to 'drivers/net/usb/r8152_shield.c')
-rw-r--r--drivers/net/usb/r8152_shield.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/usb/r8152_shield.c b/drivers/net/usb/r8152_shield.c
index 6aeb74927..8718c776d 100644
--- a/drivers/net/usb/r8152_shield.c
+++ b/drivers/net/usb/r8152_shield.c
@@ -591,6 +591,7 @@ int set_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data)
591 value, index, tmp, size, 500); 591 value, index, tmp, size, 500);
592 592
593 kfree(tmp); 593 kfree(tmp);
594
594 return ret; 595 return ret;
595} 596}
596 597
@@ -1512,6 +1513,7 @@ static void tx_bottom(struct r8152 *tp)
1512 netif_warn(tp, tx_err, netdev, 1513 netif_warn(tp, tx_err, netdev,
1513 "failed tx_urb %d\n", res); 1514 "failed tx_urb %d\n", res);
1514 stats->tx_dropped += agg->skb_num; 1515 stats->tx_dropped += agg->skb_num;
1516
1515 spin_lock_irqsave(&tp->tx_lock, flags); 1517 spin_lock_irqsave(&tp->tx_lock, flags);
1516 list_add_tail(&agg->list, &tp->tx_free); 1518 list_add_tail(&agg->list, &tp->tx_free);
1517 spin_unlock_irqrestore(&tp->tx_lock, flags); 1519 spin_unlock_irqrestore(&tp->tx_lock, flags);
@@ -1831,7 +1833,6 @@ static void r8152_power_cut_en(struct r8152 *tp, bool enable)
1831 ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS); 1833 ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS);
1832 ocp_data &= ~RESUME_INDICATE; 1834 ocp_data &= ~RESUME_INDICATE;
1833 ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data); 1835 ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data);
1834
1835} 1836}
1836 1837
1837#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST) 1838#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
@@ -2011,8 +2012,8 @@ static void r8152b_hw_phy_cfg(struct r8152 *tp)
2011 2012
2012static void r8152b_exit_oob(struct r8152 *tp) 2013static void r8152b_exit_oob(struct r8152 *tp)
2013{ 2014{
2014 u32 ocp_data; 2015 u32 ocp_data;
2015 int i; 2016 int i;
2016 2017
2017 ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); 2018 ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
2018 ocp_data &= ~RCR_ACPT_ALL; 2019 ocp_data &= ~RCR_ACPT_ALL;
@@ -2571,6 +2572,7 @@ static int rtl8152_open(struct net_device *netdev)
2571 netif_carrier_off(netdev); 2572 netif_carrier_off(netdev);
2572 netif_start_queue(netdev); 2573 netif_start_queue(netdev);
2573 set_bit(WORK_ENABLE, &tp->flags); 2574 set_bit(WORK_ENABLE, &tp->flags);
2575
2574 res = usb_submit_urb(tp->intr_urb, GFP_KERNEL); 2576 res = usb_submit_urb(tp->intr_urb, GFP_KERNEL);
2575 if (res) { 2577 if (res) {
2576 if (res == -ENODEV) 2578 if (res == -ENODEV)
@@ -3104,6 +3106,7 @@ static int rtl8152_probe(struct usb_interface *intf,
3104 3106
3105 netdev->features |= NETIF_F_IP_CSUM; 3107 netdev->features |= NETIF_F_IP_CSUM;
3106 netdev->hw_features = NETIF_F_IP_CSUM; 3108 netdev->hw_features = NETIF_F_IP_CSUM;
3109
3107 SET_ETHTOOL_OPS(netdev, &ops); 3110 SET_ETHTOOL_OPS(netdev, &ops);
3108 3111
3109 tp->mii.dev = netdev; 3112 tp->mii.dev = netdev;