Commit 78524c01 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 0d56e5c1
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include "hd64570.h" #include "hd64570.h"
static const char* version = "Moxa C101 driver version: 1.15"; static const char* version = "Moxa C101 driver version: 1.15";
static const char* devname = "C101"; static const char* devname = "C101";
...@@ -51,7 +50,6 @@ static const char* devname = "C101"; ...@@ -51,7 +50,6 @@ static const char* devname = "C101";
static char *hw; /* pointer to hw=xxx command line string */ static char *hw; /* pointer to hw=xxx command line string */
typedef struct card_s { typedef struct card_s {
struct net_device *dev; struct net_device *dev;
spinlock_t lock; /* TX lock */ spinlock_t lock; /* TX lock */
...@@ -79,7 +77,6 @@ typedef card_t port_t; ...@@ -79,7 +77,6 @@ typedef card_t port_t;
static card_t *first_card; static card_t *first_card;
static card_t **new_card = &first_card; static card_t **new_card = &first_card;
#define sca_in(reg, card) readb((card)->win0base + C101_SCA + (reg)) #define sca_in(reg, card) readb((card)->win0base + C101_SCA + (reg))
#define sca_out(value, reg, card) writeb(value, (card)->win0base + C101_SCA + (reg)) #define sca_out(value, reg, card) writeb(value, (card)->win0base + C101_SCA + (reg))
#define sca_inw(reg, card) readw((card)->win0base + C101_SCA + (reg)) #define sca_inw(reg, card) readw((card)->win0base + C101_SCA + (reg))
...@@ -99,7 +96,6 @@ static card_t **new_card = &first_card; ...@@ -99,7 +96,6 @@ static card_t **new_card = &first_card;
#define get_port(card, port) (card) #define get_port(card, port) (card)
static void sca_msci_intr(port_t *port); static void sca_msci_intr(port_t *port);
static inline u8 sca_get_page(card_t *card) static inline u8 sca_get_page(card_t *card)
{ {
return card->page; return card->page;
...@@ -111,10 +107,8 @@ static inline void openwin(card_t *card, u8 page) ...@@ -111,10 +107,8 @@ static inline void openwin(card_t *card, u8 page)
writeb(page, card->win0base + C101_PAGE); writeb(page, card->win0base + C101_PAGE);
} }
#include "hd64570.c" #include "hd64570.c"
static inline void set_carrier(port_t *port) static inline void set_carrier(port_t *port)
{ {
if (!(sca_in(MSCI1_OFFSET + ST3, port) & ST3_DCD)) if (!(sca_in(MSCI1_OFFSET + ST3, port) & ST3_DCD))
...@@ -123,7 +117,6 @@ static inline void set_carrier(port_t *port) ...@@ -123,7 +117,6 @@ static inline void set_carrier(port_t *port)
netif_carrier_off(port_to_dev(port)); netif_carrier_off(port_to_dev(port));
} }
static void sca_msci_intr(port_t *port) static void sca_msci_intr(port_t *port)
{ {
u8 stat = sca_in(MSCI0_OFFSET + ST1, port); /* read MSCI ST1 status */ u8 stat = sca_in(MSCI0_OFFSET + ST1, port); /* read MSCI ST1 status */
...@@ -145,7 +138,6 @@ static void sca_msci_intr(port_t *port) ...@@ -145,7 +138,6 @@ static void sca_msci_intr(port_t *port)
set_carrier(port); set_carrier(port);
} }
static void c101_set_iface(port_t *port) static void c101_set_iface(port_t *port)
{ {
u8 rxs = port->rxs & CLK_BRG_MASK; u8 rxs = port->rxs & CLK_BRG_MASK;
...@@ -179,7 +171,6 @@ static void c101_set_iface(port_t *port) ...@@ -179,7 +171,6 @@ static void c101_set_iface(port_t *port)
sca_set_port(port); sca_set_port(port);
} }
static int c101_open(struct net_device *dev) static int c101_open(struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
...@@ -206,7 +197,6 @@ static int c101_open(struct net_device *dev) ...@@ -206,7 +197,6 @@ static int c101_open(struct net_device *dev)
return 0; return 0;
} }
static int c101_close(struct net_device *dev) static int c101_close(struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
...@@ -218,7 +208,6 @@ static int c101_close(struct net_device *dev) ...@@ -218,7 +208,6 @@ static int c101_close(struct net_device *dev)
return 0; return 0;
} }
static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int c101_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);
...@@ -276,8 +265,6 @@ static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) ...@@ -276,8 +265,6 @@ static int c101_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
} }
} }
static void c101_destroy_card(card_t *card) static void c101_destroy_card(card_t *card)
{ {
readb(card->win0base + C101_PAGE); /* Resets SCA? */ readb(card->win0base + C101_PAGE); /* Resets SCA? */
...@@ -392,8 +379,6 @@ static int __init c101_run(unsigned long irq, unsigned long winbase) ...@@ -392,8 +379,6 @@ static int __init c101_run(unsigned long irq, unsigned long winbase)
return 0; return 0;
} }
static int __init c101_init(void) static int __init c101_init(void)
{ {
if (hw == NULL) { if (hw == NULL) {
...@@ -425,7 +410,6 @@ static int __init c101_init(void) ...@@ -425,7 +410,6 @@ static int __init c101_init(void)
return first_card ? 0 : -EINVAL; return first_card ? 0 : -EINVAL;
} }
static void __exit c101_cleanup(void) static void __exit c101_cleanup(void)
{ {
card_t *card = first_card; card_t *card = first_card;
...@@ -438,7 +422,6 @@ static void __exit c101_cleanup(void) ...@@ -438,7 +422,6 @@ static void __exit c101_cleanup(void)
} }
} }
module_init(c101_init); module_init(c101_init);
module_exit(c101_cleanup); module_exit(c101_cleanup);
......
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