Commit 725637a8 authored by Peng Li's avatar Peng Li Committed by David S. Miller

net: hd64570: 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 06d62113
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
#define SCA_INTR_DMAC_RX(node) (node ? 0x20 : 0x02) #define SCA_INTR_DMAC_RX(node) (node ? 0x20 : 0x02)
#define SCA_INTR_DMAC_TX(node) (node ? 0x40 : 0x04) #define SCA_INTR_DMAC_TX(node) (node ? 0x40 : 0x04)
static inline struct net_device *port_to_dev(port_t *port) static inline struct net_device *port_to_dev(port_t *port)
{ {
return port->dev; return port->dev;
...@@ -87,7 +86,6 @@ static inline u16 next_desc(port_t *port, u16 desc, int transmit) ...@@ -87,7 +86,6 @@ static inline u16 next_desc(port_t *port, u16 desc, int transmit)
: port_to_card(port)->rx_ring_buffers); : port_to_card(port)->rx_ring_buffers);
} }
static inline u16 desc_abs_number(port_t *port, u16 desc, int transmit) static inline u16 desc_abs_number(port_t *port, u16 desc, int transmit)
{ {
u16 rx_buffs = port_to_card(port)->rx_ring_buffers; u16 rx_buffs = port_to_card(port)->rx_ring_buffers;
...@@ -98,14 +96,12 @@ static inline u16 desc_abs_number(port_t *port, u16 desc, int transmit) ...@@ -98,14 +96,12 @@ static inline u16 desc_abs_number(port_t *port, u16 desc, int transmit)
transmit * rx_buffs + desc; transmit * rx_buffs + desc;
} }
static inline u16 desc_offset(port_t *port, u16 desc, int transmit) static inline u16 desc_offset(port_t *port, u16 desc, int transmit)
{ {
/* Descriptor offset always fits in 16 bits */ /* Descriptor offset always fits in 16 bits */
return desc_abs_number(port, desc, transmit) * sizeof(pkt_desc); return desc_abs_number(port, desc, transmit) * sizeof(pkt_desc);
} }
static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc, static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc,
int transmit) int transmit)
{ {
...@@ -118,14 +114,12 @@ static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc, ...@@ -118,14 +114,12 @@ static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc,
#endif #endif
} }
static inline u32 buffer_offset(port_t *port, u16 desc, int transmit) static inline u32 buffer_offset(port_t *port, u16 desc, int transmit)
{ {
return port_to_card(port)->buff_offset + return port_to_card(port)->buff_offset +
desc_abs_number(port, desc, transmit) * (u32)HDLC_MAX_MRU; desc_abs_number(port, desc, transmit) * (u32)HDLC_MAX_MRU;
} }
static inline void sca_set_carrier(port_t *port) static inline void sca_set_carrier(port_t *port)
{ {
if (!(sca_in(get_msci(port) + ST3, port_to_card(port)) & ST3_DCD)) { if (!(sca_in(get_msci(port) + ST3, port_to_card(port)) & ST3_DCD)) {
...@@ -143,7 +137,6 @@ static inline void sca_set_carrier(port_t *port) ...@@ -143,7 +137,6 @@ static inline void sca_set_carrier(port_t *port)
} }
} }
static void sca_init_port(port_t *port) static void sca_init_port(port_t *port)
{ {
card_t *card = port_to_card(port); card_t *card = port_to_card(port);
...@@ -213,7 +206,6 @@ static void sca_init_port(port_t *port) ...@@ -213,7 +206,6 @@ static void sca_init_port(port_t *port)
sca_set_carrier(port); sca_set_carrier(port);
} }
#ifdef NEED_SCA_MSCI_INTR #ifdef NEED_SCA_MSCI_INTR
/* MSCI interrupt service */ /* MSCI interrupt service */
static inline void sca_msci_intr(port_t *port) static inline void sca_msci_intr(port_t *port)
...@@ -236,7 +228,6 @@ static inline void sca_msci_intr(port_t *port) ...@@ -236,7 +228,6 @@ static inline void sca_msci_intr(port_t *port)
} }
#endif #endif
static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc, static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc,
u16 rxin) u16 rxin)
{ {
...@@ -282,7 +273,6 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc, ...@@ -282,7 +273,6 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc,
netif_rx(skb); netif_rx(skb);
} }
/* Receive DMA interrupt service */ /* Receive DMA interrupt service */
static inline void sca_rx_intr(port_t *port) static inline void sca_rx_intr(port_t *port)
{ {
...@@ -334,7 +324,6 @@ static inline void sca_rx_intr(port_t *port) ...@@ -334,7 +324,6 @@ static inline void sca_rx_intr(port_t *port)
sca_out(DSR_DE, DSR_RX(phy_node(port)), card); sca_out(DSR_DE, DSR_RX(phy_node(port)), card);
} }
/* Transmit DMA interrupt service */ /* Transmit DMA interrupt service */
static inline void sca_tx_intr(port_t *port) static inline void sca_tx_intr(port_t *port)
{ {
...@@ -370,7 +359,6 @@ static inline void sca_tx_intr(port_t *port) ...@@ -370,7 +359,6 @@ static inline void sca_tx_intr(port_t *port)
spin_unlock(&port->lock); spin_unlock(&port->lock);
} }
static irqreturn_t sca_intr(int irq, void* dev_id) static irqreturn_t sca_intr(int irq, void* dev_id)
{ {
card_t *card = dev_id; card_t *card = dev_id;
...@@ -400,7 +388,6 @@ static irqreturn_t sca_intr(int irq, void* dev_id) ...@@ -400,7 +388,6 @@ static irqreturn_t sca_intr(int irq, void* dev_id)
return IRQ_RETVAL(handled); return IRQ_RETVAL(handled);
} }
static void sca_set_port(port_t *port) static void sca_set_port(port_t *port)
{ {
card_t* card = port_to_card(port); card_t* card = port_to_card(port);
...@@ -408,7 +395,6 @@ static void sca_set_port(port_t *port) ...@@ -408,7 +395,6 @@ static void sca_set_port(port_t *port)
u8 md2 = sca_in(msci + MD2, card); u8 md2 = sca_in(msci + MD2, card);
unsigned int tmc, br = 10, brv = 1024; unsigned int tmc, br = 10, brv = 1024;
if (port->settings.clock_rate > 0) { if (port->settings.clock_rate > 0) {
/* Try lower br for better accuracy*/ /* Try lower br for better accuracy*/
do { do {
...@@ -450,10 +436,8 @@ static void sca_set_port(port_t *port) ...@@ -450,10 +436,8 @@ static void sca_set_port(port_t *port)
md2 &= ~MD2_LOOPBACK; md2 &= ~MD2_LOOPBACK;
sca_out(md2, msci + MD2, card); sca_out(md2, msci + MD2, card);
} }
static void sca_open(struct net_device *dev) static void sca_open(struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
...@@ -517,7 +501,6 @@ static void sca_open(struct net_device *dev) ...@@ -517,7 +501,6 @@ static void sca_open(struct net_device *dev)
netif_start_queue(dev); netif_start_queue(dev);
} }
static void sca_close(struct net_device *dev) static void sca_close(struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
...@@ -535,7 +518,6 @@ static void sca_close(struct net_device *dev) ...@@ -535,7 +518,6 @@ static void sca_close(struct net_device *dev)
netif_stop_queue(dev); netif_stop_queue(dev);
} }
static int sca_attach(struct net_device *dev, unsigned short encoding, static int sca_attach(struct net_device *dev, unsigned short encoding,
unsigned short parity) unsigned short parity)
{ {
...@@ -558,7 +540,6 @@ static int sca_attach(struct net_device *dev, unsigned short encoding, ...@@ -558,7 +540,6 @@ static int sca_attach(struct net_device *dev, unsigned short encoding,
return 0; return 0;
} }
#ifdef DEBUG_RINGS #ifdef DEBUG_RINGS
static void sca_dump_rings(struct net_device *dev) static void sca_dump_rings(struct net_device *dev)
{ {
...@@ -613,7 +594,6 @@ static void sca_dump_rings(struct net_device *dev) ...@@ -613,7 +594,6 @@ static void sca_dump_rings(struct net_device *dev)
} }
#endif /* DEBUG_RINGS */ #endif /* DEBUG_RINGS */
static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
port_t *port = dev_to_port(dev); port_t *port = dev_to_port(dev);
...@@ -670,7 +650,6 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -670,7 +650,6 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
#ifdef NEED_DETECT_RAM #ifdef NEED_DETECT_RAM
static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize) static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
{ {
...@@ -699,7 +678,6 @@ static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize) ...@@ -699,7 +678,6 @@ static u32 sca_detect_ram(card_t *card, u8 __iomem *rambase, u32 ramsize)
} }
#endif /* NEED_DETECT_RAM */ #endif /* NEED_DETECT_RAM */
static void sca_init(card_t *card, int wait_states) static void sca_init(card_t *card, int wait_states)
{ {
sca_out(wait_states, WCRL, card); /* Wait Control */ sca_out(wait_states, WCRL, card); /* Wait Control */
......
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