Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e08f53f5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'r8152' 



Hayes Wang says:

====================
r8152: cleanups

Deal with some empty lines and spaces, replace some tp->netdev with netdev,
and remove the unnecessary function.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 67ddc87f 05e0f1aa

drivers/net/usb/r8152.c

+16 −20
Original line number Diff line number Diff line
@@ -593,6 +593,7 @@ int set_registers(struct r8152 *tp, u16 value, u16 index, u16 size, void *data) 
			       value, index, tmp, size, 500);



	kfree(tmp);



	return ret;

}
@@ -959,11 +960,6 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p) 
	return 0;

}



static struct net_device_stats *rtl8152_get_stats(struct net_device *dev)

{

	return &dev->stats;

}



static void read_bulk_callback(struct urb *urb)

{

	struct net_device *netdev;
@@ -1036,6 +1032,7 @@ static void read_bulk_callback(struct urb *urb) 
static void write_bulk_callback(struct urb *urb)

{

	struct net_device_stats *stats;

	struct net_device *netdev;

	unsigned long flags;

	struct tx_agg *agg;

	struct r8152 *tp;
@@ -1049,10 +1046,11 @@ static void write_bulk_callback(struct urb *urb) 
	if (!tp)

		return;



	stats = rtl8152_get_stats(tp->netdev);

	netdev = tp->netdev;

	stats = &netdev->stats;

	if (status) {

		if (net_ratelimit())

			netdev_warn(tp->netdev, "Tx status %d\n", status);

			netdev_warn(netdev, "Tx status %d\n", status);

		stats->tx_errors += agg->skb_num;

	} else {

		stats->tx_packets += agg->skb_num;
@@ -1065,7 +1063,7 @@ static void write_bulk_callback(struct urb *urb) 


	usb_autopm_put_interface_async(tp->intf);



	if (!netif_carrier_ok(tp->netdev))

	if (!netif_carrier_ok(netdev))

		return;



	if (!test_bit(WORK_ENABLE, &tp->flags))
@@ -1439,7 +1437,7 @@ static void rx_bottom(struct r8152 *tp) 


		while (urb->actual_length > len_used) {

			struct net_device *netdev = tp->netdev;

			struct net_device_stats *stats;

			struct net_device_stats *stats = &netdev->stats;

			unsigned int pkt_len;

			struct sk_buff *skb;
@@ -1451,8 +1449,6 @@ static void rx_bottom(struct r8152 *tp) 
			if (urb->actual_length < len_used)

				break;



			stats = rtl8152_get_stats(netdev);



			pkt_len -= CRC_SIZE;

			rx_data += sizeof(struct rx_desc);
@@ -1501,19 +1497,18 @@ static void tx_bottom(struct r8152 *tp) 


		res = r8152_tx_agg_fill(tp, agg);

		if (res) {

			struct net_device_stats *stats;

			struct net_device *netdev;

			unsigned long flags;



			netdev = tp->netdev;

			stats = rtl8152_get_stats(netdev);

			struct net_device *netdev = tp->netdev;



			if (res == -ENODEV) {

				netif_device_detach(netdev);

			} else {

				struct net_device_stats *stats = &netdev->stats;

				unsigned long flags;



				netif_warn(tp, tx_err, netdev,

					   "failed tx_urb %d\n", res);

				stats->tx_dropped += agg->skb_num;



				spin_lock_irqsave(&tp->tx_lock, flags);

				list_add_tail(&agg->list, &tp->tx_free);

				spin_unlock_irqrestore(&tp->tx_lock, flags);
@@ -1833,7 +1828,6 @@ static void r8152_power_cut_en(struct r8152 *tp, bool enable) 
	ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS);

	ocp_data &= ~RESUME_INDICATE;

	ocp_write_word(tp, MCU_TYPE_USB, USB_PM_CTRL_STATUS, ocp_data);



}



#define WAKE_ANY (WAKE_PHY | WAKE_MAGIC | WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)
@@ -2573,6 +2567,7 @@ static int rtl8152_open(struct net_device *netdev) 
	netif_carrier_off(netdev);

	netif_start_queue(netdev);

	set_bit(WORK_ENABLE, &tp->flags);



	res = usb_submit_urb(tp->intr_urb, GFP_KERNEL);

	if (res) {

		if (res == -ENODEV)
@@ -3101,6 +3096,7 @@ static int rtl8152_probe(struct usb_interface *intf, 


	netdev->features |= NETIF_F_IP_CSUM;

	netdev->hw_features = NETIF_F_IP_CSUM;



	SET_ETHTOOL_OPS(netdev, &ops);



	tp->mii.dev = netdev;