Skip to content

Commit

Permalink
net: usb: delete extra space and tab in blank line
Browse files Browse the repository at this point in the history
delete extra space and tab in blank line, there is no functional change.

Signed-off-by: Xie Shaowen <studentxswpy@163.com>
Link: https://lore.kernel.org/r/20220727081253.3043941-1-studentxswpy@163.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Xie Shaowen authored and Jakub Kicinski committed Jul 29, 2022
1 parent 272ac32 commit efe3e6b
Showing 5 changed files with 30 additions and 30 deletions.
44 changes: 22 additions & 22 deletions drivers/net/usb/catc.c
Original file line number Diff line number Diff line change
@@ -8,13 +8,13 @@
*
* Based on the work of
* Donald Becker
*
*
* Old chipset support added by Simon Evans <spse@secret.org.uk> 2002
* - adds support for Belkin F5U011
*/

/*
*
*
* Should you need to contact me, the author, you can do so either by
* e-mail - mail your message to <vojtech@suse.cz>, or by paper mail:
* Vojtech Pavlik, Simunkova 1594, Prague 8, 182 00 Czech Republic
@@ -54,7 +54,7 @@ static const char driver_name[] = "catc";

/*
* Some defines.
*/
*/

#define STATS_UPDATE (HZ) /* Time between stats updates */
#define TX_TIMEOUT (5*HZ) /* Max time the queue can be stopped */
@@ -332,7 +332,7 @@ static void catc_irq_done(struct urb *urb)
dev_err(&catc->usbdev->dev,
"submit(rx_urb) status %d\n", res);
}
}
}
}
resubmit:
res = usb_submit_urb (urb, GFP_ATOMIC);
@@ -538,7 +538,7 @@ static int catc_ctrl_async(struct catc *catc, u8 dir, u8 request, u16 value,
unsigned long flags;

spin_lock_irqsave(&catc->ctrl_lock, flags);

q = catc->ctrl_queue + catc->ctrl_head;

q->dir = dir;
@@ -639,7 +639,7 @@ static void catc_set_multicast_list(struct net_device *netdev)
if (netdev->flags & IFF_PROMISC) {
memset(catc->multicast, 0xff, 64);
rx |= (!catc->is_f5u011) ? RxPromisc : AltRxPromisc;
}
}

if (netdev->flags & IFF_ALLMULTI) {
memset(catc->multicast, 0xff, 64);
@@ -806,25 +806,25 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
catc->tx_urb = usb_alloc_urb(0, GFP_KERNEL);
catc->rx_urb = usb_alloc_urb(0, GFP_KERNEL);
catc->irq_urb = usb_alloc_urb(0, GFP_KERNEL);
if ((!catc->ctrl_urb) || (!catc->tx_urb) ||
if ((!catc->ctrl_urb) || (!catc->tx_urb) ||
(!catc->rx_urb) || (!catc->irq_urb)) {
dev_err(&intf->dev, "No free urbs available.\n");
ret = -ENOMEM;
goto fail_free;
}

/* The F5U011 has the same vendor/product as the netmate but a device version of 0x130 */
if (le16_to_cpu(usbdev->descriptor.idVendor) == 0x0423 &&
if (le16_to_cpu(usbdev->descriptor.idVendor) == 0x0423 &&
le16_to_cpu(usbdev->descriptor.idProduct) == 0xa &&
le16_to_cpu(catc->usbdev->descriptor.bcdDevice) == 0x0130) {
dev_dbg(dev, "Testing for f5u011\n");
catc->is_f5u011 = 1;
catc->is_f5u011 = 1;
atomic_set(&catc->recq_sz, 0);
pktsz = RX_PKT_SZ;
} else {
pktsz = RX_MAX_BURST * (PKT_SZ + 2);
}

usb_fill_control_urb(catc->ctrl_urb, usbdev, usb_sndctrlpipe(usbdev, 0),
NULL, NULL, 0, catc_ctrl_done, catc);

@@ -854,7 +854,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
*buf = 0x87654321;
catc_write_mem(catc, 0xfa80, buf, 4);
catc_read_mem(catc, 0x7a80, buf, 4);

switch (*buf) {
case 0x12345678:
catc_set_reg(catc, TxBufCount, 8);
@@ -873,32 +873,32 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
}

kfree(buf);

dev_dbg(dev, "Getting MAC from SEEROM.\n");

catc_get_mac(catc, macbuf);
eth_hw_addr_set(netdev, macbuf);

dev_dbg(dev, "Setting MAC into registers.\n");

for (i = 0; i < 6; i++)
catc_set_reg(catc, StationAddr0 - i, netdev->dev_addr[i]);

dev_dbg(dev, "Filling the multicast list.\n");

eth_broadcast_addr(broadcast);
catc_multicast(broadcast, catc->multicast);
catc_multicast(netdev->dev_addr, catc->multicast);
catc_write_mem(catc, 0xfa80, catc->multicast, 64);

dev_dbg(dev, "Clearing error counters.\n");

for (i = 0; i < 8; i++)
catc_set_reg(catc, EthStats + i, 0);
catc->last_stats = jiffies;

dev_dbg(dev, "Enabling.\n");

catc_set_reg(catc, MaxBurst, RX_MAX_BURST);
catc_set_reg(catc, OpModes, OpTxMerge | OpRxMerge | OpLenInclude | Op3MemWaits);
catc_set_reg(catc, LEDCtrl, LEDLink);
@@ -908,7 +908,7 @@ static int catc_probe(struct usb_interface *intf, const struct usb_device_id *id
catc_reset(catc);
catc_get_mac(catc, macbuf);
eth_hw_addr_set(netdev, macbuf);

dev_dbg(dev, "Setting RX Mode\n");
catc->rxmode[0] = RxEnable | RxPolarity | RxMultiCast;
catc->rxmode[1] = 0;
10 changes: 5 additions & 5 deletions drivers/net/usb/cdc_subset.c
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ static const struct driver_info an2720_info = {

#endif /* CONFIG_USB_AN2720 */



#ifdef CONFIG_USB_BELKIN
#define HAVE_HARDWARE

@@ -140,7 +140,7 @@ static const struct driver_info belkin_info = {
#endif /* CONFIG_USB_BELKIN */




#ifdef CONFIG_USB_EPSON2888
#define HAVE_HARDWARE

@@ -167,7 +167,7 @@ static const struct driver_info epson2888_info = {

#endif /* CONFIG_USB_EPSON2888 */



/*-------------------------------------------------------------------------
*
* info from Jonathan McDowell <noodles@earth.li>
@@ -181,7 +181,7 @@ static const struct driver_info kc2190_info = {
};
#endif /* CONFIG_USB_KC2190 */



#ifdef CONFIG_USB_ARMLINUX
#define HAVE_HARDWARE

@@ -222,7 +222,7 @@ static const struct driver_info blob_info = {

#endif /* CONFIG_USB_ARMLINUX */



/*-------------------------------------------------------------------------*/

#ifndef HAVE_HARDWARE
2 changes: 1 addition & 1 deletion drivers/net/usb/kaweth.c
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@ struct kaweth_device
dma_addr_t rxbufferhandle;
__u8 *rx_buf;


struct sk_buff *tx_skb;

__u8 *firmware_buf;
2 changes: 1 addition & 1 deletion drivers/net/usb/plusb.c
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@


/*
* Prolific PL-2301/PL-2302 driver ... http://www.prolific.com.tw/
* Prolific PL-2301/PL-2302 driver ... http://www.prolific.com.tw/
*
* The protocol and handshaking used here should be bug-compatible
* with the Linux 2.2 "plusb" driver, by Deti Fliegl.
2 changes: 1 addition & 1 deletion drivers/net/usb/usbnet.c
Original file line number Diff line number Diff line change
@@ -381,7 +381,7 @@ void usbnet_update_max_qlen(struct usbnet *dev)
}
EXPORT_SYMBOL_GPL(usbnet_update_max_qlen);



/*-------------------------------------------------------------------------
*
* Network Device Driver (peer link to "Host Device", from USB host)

0 comments on commit efe3e6b

Please sign in to comment.