Commit 8890d0a1 authored by Peng Li's avatar Peng Li Committed by David S. Miller

net: wan: remove redundant blank lines

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