mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-01 04:53:09 -04:00
net: wan: remove redundant blank lines
This patch removes some redundant blank lines. Signed-off-by: Peng Li <lipeng321@huawei.com> Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
@@ -50,7 +50,6 @@ static const char* version = "wanXL serial card driver version: 0.48";
|
||||
/* MAILBOX #2 - DRAM SIZE */
|
||||
#define MBX2_MEMSZ_MASK 0xFFFF0000 /* PUTS Memory Size Register mask */
|
||||
|
||||
|
||||
struct port {
|
||||
struct net_device *dev;
|
||||
struct card *card;
|
||||
@@ -61,13 +60,11 @@ struct port {
|
||||
struct sk_buff *tx_skbs[TX_BUFFERS];
|
||||
};
|
||||
|
||||
|
||||
struct card_status {
|
||||
desc_t rx_descs[RX_QUEUE_LENGTH];
|
||||
port_status_t port_status[4];
|
||||
};
|
||||
|
||||
|
||||
struct card {
|
||||
int n_ports; /* 1, 2 or 4 ports */
|
||||
u8 irq;
|
||||
@@ -81,20 +78,16 @@ struct card {
|
||||
struct port ports[]; /* 1 - 4 port structures follow */
|
||||
};
|
||||
|
||||
|
||||
|
||||
static inline struct port *dev_to_port(struct net_device *dev)
|
||||
{
|
||||
return (struct port *)dev_to_hdlc(dev)->priv;
|
||||
}
|
||||
|
||||
|
||||
static inline port_status_t *get_status(struct port *port)
|
||||
{
|
||||
return &port->card->status->port_status[port->node];
|
||||
}
|
||||
|
||||
|
||||
#ifdef DEBUG_PCI
|
||||
static inline dma_addr_t pci_map_single_debug(struct pci_dev *pdev, void *ptr,
|
||||
size_t size, int direction)
|
||||
@@ -110,7 +103,6 @@ static inline dma_addr_t pci_map_single_debug(struct pci_dev *pdev, void *ptr,
|
||||
#define pci_map_single pci_map_single_debug
|
||||
#endif
|
||||
|
||||
|
||||
/* Cable and/or personality module change interrupt service */
|
||||
static inline void wanxl_cable_intr(struct port *port)
|
||||
{
|
||||
@@ -154,8 +146,6 @@ static inline void wanxl_cable_intr(struct port *port)
|
||||
netif_carrier_off(port->dev);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Transmit complete interrupt service */
|
||||
static inline void wanxl_tx_intr(struct port *port)
|
||||
{
|
||||
@@ -187,8 +177,6 @@ static inline void wanxl_tx_intr(struct port *port)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* Receive complete interrupt service */
|
||||
static inline void wanxl_rx_intr(struct card *card)
|
||||
{
|
||||
@@ -239,8 +227,6 @@ static inline void wanxl_rx_intr(struct card *card)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
static irqreturn_t wanxl_intr(int irq, void* dev_id)
|
||||
{
|
||||
struct card *card = dev_id;
|
||||
@@ -248,7 +234,6 @@ static irqreturn_t wanxl_intr(int irq, void* dev_id)
|
||||
u32 stat;
|
||||
int handled = 0;
|
||||
|
||||
|
||||
while((stat = readl(card->plx + PLX_DOORBELL_FROM_CARD)) != 0) {
|
||||
handled = 1;
|
||||
writel(stat, card->plx + PLX_DOORBELL_FROM_CARD);
|
||||
@@ -266,8 +251,6 @@ static irqreturn_t wanxl_intr(int irq, void* dev_id)
|
||||
return IRQ_RETVAL(handled);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static netdev_tx_t wanxl_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
{
|
||||
struct port *port = dev_to_port(dev);
|
||||
@@ -312,8 +295,6 @@ static netdev_tx_t wanxl_xmit(struct sk_buff *skb, struct net_device *dev)
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int wanxl_attach(struct net_device *dev, unsigned short encoding,
|
||||
unsigned short parity)
|
||||
{
|
||||
@@ -335,8 +316,6 @@ static int wanxl_attach(struct net_device *dev, unsigned short encoding,
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||
{
|
||||
const size_t size = sizeof(sync_serial_settings);
|
||||
@@ -387,8 +366,6 @@ static int wanxl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int wanxl_open(struct net_device *dev)
|
||||
{
|
||||
struct port *port = dev_to_port(dev);
|
||||
@@ -423,8 +400,6 @@ static int wanxl_open(struct net_device *dev)
|
||||
return -EFAULT;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int wanxl_close(struct net_device *dev)
|
||||
{
|
||||
struct port *port = dev_to_port(dev);
|
||||
@@ -461,8 +436,6 @@ static int wanxl_close(struct net_device *dev)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static struct net_device_stats *wanxl_get_stats(struct net_device *dev)
|
||||
{
|
||||
struct port *port = dev_to_port(dev);
|
||||
@@ -474,8 +447,6 @@ static struct net_device_stats *wanxl_get_stats(struct net_device *dev)
|
||||
return &dev->stats;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static int wanxl_puts_command(struct card *card, u32 cmd)
|
||||
{
|
||||
unsigned long timeout = jiffies + 5 * HZ;
|
||||
@@ -491,8 +462,6 @@ static int wanxl_puts_command(struct card *card, u32 cmd)
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void wanxl_reset(struct card *card)
|
||||
{
|
||||
u32 old_value = readl(card->plx + PLX_CONTROL) & ~PLX_CTL_RESET;
|
||||
@@ -505,8 +474,6 @@ static void wanxl_reset(struct card *card)
|
||||
readl(card->plx + PLX_CONTROL); /* wait for posted write */
|
||||
}
|
||||
|
||||
|
||||
|
||||
static void wanxl_pci_remove_one(struct pci_dev *pdev)
|
||||
{
|
||||
struct card *card = pci_get_drvdata(pdev);
|
||||
@@ -543,7 +510,6 @@ static void wanxl_pci_remove_one(struct pci_dev *pdev)
|
||||
kfree(card);
|
||||
}
|
||||
|
||||
|
||||
#include "wanxlfw.inc"
|
||||
|
||||
static const struct net_device_ops wanxl_ops = {
|
||||
@@ -677,7 +643,6 @@ static int wanxl_pci_init_one(struct pci_dev *pdev,
|
||||
/* set up on-board RAM mapping */
|
||||
mem_phy = pci_resource_start(pdev, 2);
|
||||
|
||||
|
||||
/* sanity check the board's reported memory size */
|
||||
if (ramsize < BUFFERS_ADDR +
|
||||
(TX_BUFFERS + RX_BUFFERS) * BUFFER_LENGTH * ports) {
|
||||
@@ -813,7 +778,6 @@ static const struct pci_device_id wanxl_pci_tbl[] = {
|
||||
{ 0, }
|
||||
};
|
||||
|
||||
|
||||
static struct pci_driver wanxl_pci_driver = {
|
||||
.name = "wanXL",
|
||||
.id_table = wanxl_pci_tbl,
|
||||
@@ -821,7 +785,6 @@ static struct pci_driver wanxl_pci_driver = {
|
||||
.remove = wanxl_pci_remove_one,
|
||||
};
|
||||
|
||||
|
||||
static int __init wanxl_init_module(void)
|
||||
{
|
||||
#ifdef MODULE
|
||||
@@ -835,7 +798,6 @@ static void __exit wanxl_cleanup_module(void)
|
||||
pci_unregister_driver(&wanxl_pci_driver);
|
||||
}
|
||||
|
||||
|
||||
MODULE_AUTHOR("Krzysztof Halasa <khc@pm.waw.pl>");
|
||||
MODULE_DESCRIPTION("SBE Inc. wanXL serial port driver");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
Reference in New Issue
Block a user