Commit 93f76437 authored by Peng Li's avatar Peng Li Committed by David S. Miller

net: pc300too: 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 51a1ebc3
...@@ -52,7 +52,6 @@ static unsigned int CLOCK_BASE; ...@@ -52,7 +52,6 @@ static unsigned int CLOCK_BASE;
#define PC300_CHMEDIA_MASK(port) (0x00000020UL << ((port) * 3)) #define PC300_CHMEDIA_MASK(port) (0x00000020UL << ((port) * 3))
#define PC300_CTYPE_MASK (0x00000800UL) #define PC300_CTYPE_MASK (0x00000800UL)
enum { PC300_RSV = 1, PC300_X21, PC300_TE }; /* card types */ enum { PC300_RSV = 1, PC300_X21, PC300_TE }; /* card types */
/* /*
...@@ -71,8 +70,6 @@ typedef struct { ...@@ -71,8 +70,6 @@ typedef struct {
u32 init_ctrl; /* 50h : EEPROM ctrl, Init Ctrl, etc */ u32 init_ctrl; /* 50h : EEPROM ctrl, Init Ctrl, etc */
}plx9050; }plx9050;
typedef struct port_s { typedef struct port_s {
struct napi_struct napi; struct napi_struct napi;
struct net_device *netdev; struct net_device *netdev;
...@@ -90,8 +87,6 @@ typedef struct port_s { ...@@ -90,8 +87,6 @@ typedef struct port_s {
u8 chan; /* physical port # - 0 or 1 */ u8 chan; /* physical port # - 0 or 1 */
}port_t; }port_t;
typedef struct card_s { typedef struct card_s {
int type; /* RSV, X21, etc. */ int type; /* RSV, X21, etc. */
int n_ports; /* 1 or 2 ports */ int n_ports; /* 1 or 2 ports */
...@@ -107,13 +102,11 @@ typedef struct card_s { ...@@ -107,13 +102,11 @@ typedef struct card_s {
port_t ports[2]; port_t ports[2];
}card_t; }card_t;
#define get_port(card, port) ((port) < (card)->n_ports ? \ #define get_port(card, port) ((port) < (card)->n_ports ? \
(&(card)->ports[port]) : (NULL)) (&(card)->ports[port]) : (NULL))
#include "hd64572.c" #include "hd64572.c"
static void pc300_set_iface(port_t *port) static void pc300_set_iface(port_t *port)
{ {
card_t *card = port->card; card_t *card = port->card;
...@@ -162,8 +155,6 @@ static void pc300_set_iface(port_t *port) ...@@ -162,8 +155,6 @@ static void pc300_set_iface(port_t *port)
} }
} }
static int pc300_open(struct net_device *dev) static int pc300_open(struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
...@@ -177,8 +168,6 @@ static int pc300_open(struct net_device *dev) ...@@ -177,8 +168,6 @@ static int pc300_open(struct net_device *dev)
return 0; return 0;
} }
static int pc300_close(struct net_device *dev) static int pc300_close(struct net_device *dev)
{ {
sca_close(dev); sca_close(dev);
...@@ -186,8 +175,6 @@ static int pc300_close(struct net_device *dev) ...@@ -186,8 +175,6 @@ static int pc300_close(struct net_device *dev)
return 0; return 0;
} }
static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int pc300_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);
...@@ -214,7 +201,6 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -214,7 +201,6 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
if (copy_to_user(line, &port->settings, size)) if (copy_to_user(line, &port->settings, size))
return -EFAULT; return -EFAULT;
return 0; return 0;
} }
if (port->card->type == PC300_X21 && if (port->card->type == PC300_X21 &&
...@@ -255,8 +241,6 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -255,8 +241,6 @@ static int pc300_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
return 0; return 0;
} }
static void pc300_pci_remove_one(struct pci_dev *pdev) static void pc300_pci_remove_one(struct pci_dev *pdev)
{ {
int i; int i;
...@@ -472,8 +456,6 @@ static int pc300_pci_init_one(struct pci_dev *pdev, ...@@ -472,8 +456,6 @@ static int pc300_pci_init_one(struct pci_dev *pdev,
return 0; return 0;
} }
static const struct pci_device_id pc300_pci_tbl[] = { static const struct pci_device_id pc300_pci_tbl[] = {
{ PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID, { PCI_VENDOR_ID_CYCLADES, PCI_DEVICE_ID_PC300_RX_1, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0 }, PCI_ANY_ID, 0, 0, 0 },
...@@ -486,7 +468,6 @@ static const struct pci_device_id pc300_pci_tbl[] = { ...@@ -486,7 +468,6 @@ static const struct pci_device_id pc300_pci_tbl[] = {
{ 0, } { 0, }
}; };
static struct pci_driver pc300_pci_driver = { static struct pci_driver pc300_pci_driver = {
.name = "PC300", .name = "PC300",
.id_table = pc300_pci_tbl, .id_table = pc300_pci_tbl,
...@@ -494,7 +475,6 @@ static struct pci_driver pc300_pci_driver = { ...@@ -494,7 +475,6 @@ static struct pci_driver pc300_pci_driver = {
.remove = pc300_pci_remove_one, .remove = pc300_pci_remove_one,
}; };
static int __init pc300_init_module(void) static int __init pc300_init_module(void)
{ {
if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) { if (pci_clock_freq < 1000000 || pci_clock_freq > 80000000) {
...@@ -511,8 +491,6 @@ static int __init pc300_init_module(void) ...@@ -511,8 +491,6 @@ static int __init pc300_init_module(void)
return pci_register_driver(&pc300_pci_driver); return pci_register_driver(&pc300_pci_driver);
} }
static void __exit pc300_cleanup_module(void) static void __exit pc300_cleanup_module(void)
{ {
pci_unregister_driver(&pc300_pci_driver); pci_unregister_driver(&pc300_pci_driver);
......
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