Commit 5c32fdbb authored by Peng Li's avatar Peng Li Committed by David S. Miller

net: ixp4xx_hss: 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 f1dcdc07
...@@ -83,7 +83,6 @@ ...@@ -83,7 +83,6 @@
#define PKT_HDLC_CRC_32 0x2 /* default = CRC-16 */ #define PKT_HDLC_CRC_32 0x2 /* default = CRC-16 */
#define PKT_HDLC_MSB_ENDIAN 0x4 /* default = LE */ #define PKT_HDLC_MSB_ENDIAN 0x4 /* default = LE */
/* hss_config, PCRs */ /* hss_config, PCRs */
/* Frame sync sampling, default = active low */ /* Frame sync sampling, default = active low */
#define PCR_FRM_SYNC_ACTIVE_HIGH 0x40000000 #define PCR_FRM_SYNC_ACTIVE_HIGH 0x40000000
...@@ -150,7 +149,6 @@ ...@@ -150,7 +149,6 @@
/* HSS number, default = 0 (first) */ /* HSS number, default = 0 (first) */
#define CCR_SECOND_HSS 0x01000000 #define CCR_SECOND_HSS 0x01000000
/* hss_config, clkCR: main:10, num:10, denom:12 */ /* hss_config, clkCR: main:10, num:10, denom:12 */
#define CLK42X_SPEED_EXP ((0x3FF << 22) | ( 2 << 12) | 15) /*65 KHz*/ #define CLK42X_SPEED_EXP ((0x3FF << 22) | ( 2 << 12) | 15) /*65 KHz*/
...@@ -208,7 +206,6 @@ ...@@ -208,7 +206,6 @@
#define HSS_CONFIG_TX_LUT 0x18 /* channel look-up tables */ #define HSS_CONFIG_TX_LUT 0x18 /* channel look-up tables */
#define HSS_CONFIG_RX_LUT 0x38 #define HSS_CONFIG_RX_LUT 0x38
/* NPE command codes */ /* NPE command codes */
/* writes the ConfigWord value to the location specified by offset */ /* writes the ConfigWord value to the location specified by offset */
#define PORT_CONFIG_WRITE 0x40 #define PORT_CONFIG_WRITE 0x40
...@@ -240,7 +237,6 @@ ...@@ -240,7 +237,6 @@
#define ERR_HDLC_ABORT 6 /* abort sequence received */ #define ERR_HDLC_ABORT 6 /* abort sequence received */
#define ERR_DISCONNECTING 7 /* disconnect is in progress */ #define ERR_DISCONNECTING 7 /* disconnect is in progress */
#ifdef __ARMEB__ #ifdef __ARMEB__
typedef struct sk_buff buffer_t; typedef struct sk_buff buffer_t;
#define free_buffer dev_kfree_skb #define free_buffer dev_kfree_skb
...@@ -308,7 +304,6 @@ struct desc { ...@@ -308,7 +304,6 @@ struct desc {
u32 __reserved1[4]; u32 __reserved1[4];
}; };
#define rx_desc_phys(port, n) ((port)->desc_tab_phys + \ #define rx_desc_phys(port, n) ((port)->desc_tab_phys + \
(n) * sizeof(struct desc)) (n) * sizeof(struct desc))
#define rx_desc_ptr(port, n) (&(port)->desc_tab[n]) #define rx_desc_ptr(port, n) (&(port)->desc_tab[n])
...@@ -567,7 +562,6 @@ static inline void debug_pkt(struct net_device *dev, const char *func, ...@@ -567,7 +562,6 @@ static inline void debug_pkt(struct net_device *dev, const char *func,
#endif #endif
} }
static inline void debug_desc(u32 phys, struct desc *desc) static inline void debug_desc(u32 phys, struct desc *desc)
{ {
#if DEBUG_DESC #if DEBUG_DESC
...@@ -606,7 +600,6 @@ static inline void queue_put_desc(unsigned int queue, u32 phys, ...@@ -606,7 +600,6 @@ static inline void queue_put_desc(unsigned int queue, u32 phys,
length and queues >= 32 don't support this check anyway. */ length and queues >= 32 don't support this check anyway. */
} }
static inline void dma_unmap_tx(struct port *port, struct desc *desc) static inline void dma_unmap_tx(struct port *port, struct desc *desc)
{ {
#ifdef __ARMEB__ #ifdef __ARMEB__
...@@ -619,7 +612,6 @@ static inline void dma_unmap_tx(struct port *port, struct desc *desc) ...@@ -619,7 +612,6 @@ static inline void dma_unmap_tx(struct port *port, struct desc *desc)
#endif #endif
} }
static void hss_hdlc_set_carrier(void *pdev, int carrier) static void hss_hdlc_set_carrier(void *pdev, int carrier)
{ {
struct net_device *netdev = pdev; struct net_device *netdev = pdev;
...@@ -784,7 +776,6 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget) ...@@ -784,7 +776,6 @@ static int hss_hdlc_poll(struct napi_struct *napi, int budget)
return received; /* not all work done */ return received; /* not all work done */
} }
static void hss_hdlc_txdone_irq(void *pdev) static void hss_hdlc_txdone_irq(void *pdev)
{ {
struct net_device *dev = pdev; struct net_device *dev = pdev;
...@@ -910,7 +901,6 @@ static int hss_hdlc_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -910,7 +901,6 @@ static int hss_hdlc_xmit(struct sk_buff *skb, struct net_device *dev)
return NETDEV_TX_OK; return NETDEV_TX_OK;
} }
static int request_hdlc_queues(struct port *port) static int request_hdlc_queues(struct port *port)
{ {
int err; int err;
...@@ -1160,7 +1150,6 @@ static int hss_hdlc_close(struct net_device *dev) ...@@ -1160,7 +1150,6 @@ static int hss_hdlc_close(struct net_device *dev)
return 0; return 0;
} }
static int hss_hdlc_attach(struct net_device *dev, unsigned short encoding, static int hss_hdlc_attach(struct net_device *dev, unsigned short encoding,
unsigned short parity) unsigned short parity)
{ {
......
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