* [PATCH net-next 0/8] net: hd64570: clean up some code style issues
@ 2021-06-05 7:00 Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 1/8] net: hd64570: remove redundant blank lines Guangbin Huang
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
This patchset clean up some code style issues.
Peng Li (8):
net: hd64570: remove redundant blank lines
net: hd64570: add blank line after declarations
net: hd64570: fix the code style issue about "foo* bar"
net: hd64570: fix the code style issue about trailing statements
net: hd64570: add braces {} to all arms of the statement
net: hd64570: fix the comments style issue
net: hd64570: remove redundant parentheses
net: hd64570: add some required spaces
drivers/net/wan/hd64570.c | 124 ++++++++++++++++++++++++----------------------
1 file changed, 66 insertions(+), 58 deletions(-)
--
2.8.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH net-next 1/8] net: hd64570: remove redundant blank lines
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 2/8] net: hd64570: add blank line after declarations Guangbin Huang
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
This patch removes some redundant blank lines.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 22 ----------------------
1 file changed, 22 deletions(-)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 058e481..e0266c6 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -47,7 +47,6 @@
#define SCA_INTR_DMAC_RX(node) (node ? 0x20 : 0x02)
#define SCA_INTR_DMAC_TX(node) (node ? 0x40 : 0x04)
-
static inline struct net_device *port_to_dev(port_t *port)
{
return port->dev;
@@ -87,7 +86,6 @@ static inline u16 next_desc(port_t *port, u16 desc, int transmit)
: port_to_card(port)->rx_ring_buffers);
}
-
static inline u16 desc_abs_number(port_t *port, u16 desc, int transmit)
{
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)
transmit * rx_buffs + desc;
}
-
static inline u16 desc_offset(port_t *port, u16 desc, int transmit)
{
/* Descriptor offset always fits in 16 bits */
return desc_abs_number(port, desc, transmit) * sizeof(pkt_desc);
}
-
static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc,
int transmit)
{
@@ -118,14 +114,12 @@ static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc,
#endif
}
-
static inline u32 buffer_offset(port_t *port, u16 desc, int transmit)
{
return port_to_card(port)->buff_offset +
desc_abs_number(port, desc, transmit) * (u32)HDLC_MAX_MRU;
}
-
static inline void sca_set_carrier(port_t *port)
{
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)
}
}
-
static void sca_init_port(port_t *port)
{
card_t *card = port_to_card(port);
@@ -213,7 +206,6 @@ static void sca_init_port(port_t *port)
sca_set_carrier(port);
}
-
#ifdef NEED_SCA_MSCI_INTR
/* MSCI interrupt service */
static inline void sca_msci_intr(port_t *port)
@@ -236,7 +228,6 @@ static inline void sca_msci_intr(port_t *port)
}
#endif
-
static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc,
u16 rxin)
{
@@ -282,7 +273,6 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc,
netif_rx(skb);
}
-
/* Receive DMA interrupt service */
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);
}
-
/* Transmit DMA interrupt service */
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);
}
-
static irqreturn_t sca_intr(int irq, void* dev_id)
{
card_t *card = dev_id;
@@ -400,7 +388,6 @@ static irqreturn_t sca_intr(int irq, void* dev_id)
return IRQ_RETVAL(handled);
}
-
static void sca_set_port(port_t *port)
{
card_t* card = port_to_card(port);
@@ -408,7 +395,6 @@ static void sca_set_port(port_t *port)
u8 md2 = sca_in(msci + MD2, card);
unsigned int tmc, br = 10, brv = 1024;
-
if (port->settings.clock_rate > 0) {
/* Try lower br for better accuracy*/
do {
@@ -450,10 +436,8 @@ static void sca_set_port(port_t *port)
md2 &= ~MD2_LOOPBACK;
sca_out(md2, msci + MD2, card);
-
}
-
static void sca_open(struct net_device *dev)
{
port_t *port = dev_to_port(dev);
@@ -517,7 +501,6 @@ static void sca_open(struct net_device *dev)
netif_start_queue(dev);
}
-
static void sca_close(struct net_device *dev)
{
port_t *port = dev_to_port(dev);
@@ -535,7 +518,6 @@ static void sca_close(struct net_device *dev)
netif_stop_queue(dev);
}
-
static int sca_attach(struct net_device *dev, unsigned short encoding,
unsigned short parity)
{
@@ -558,7 +540,6 @@ static int sca_attach(struct net_device *dev, unsigned short encoding,
return 0;
}
-
#ifdef DEBUG_RINGS
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 */
-
static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *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)
return NETDEV_TX_OK;
}
-
#ifdef NEED_DETECT_RAM
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 */
-
static void sca_init(card_t *card, int wait_states)
{
sca_out(wait_states, WCRL, card); /* Wait Control */
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net-next 2/8] net: hd64570: add blank line after declarations
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 1/8] net: hd64570: remove redundant blank lines Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 3/8] net: hd64570: fix the code style issue about "foo* bar" Guangbin Huang
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
This patch fixes the checkpatch error about missing a blank line
after declarations.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index e0266c6..cca6101 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -345,6 +345,7 @@ static inline void sca_tx_intr(port_t *port)
u32 desc_off = desc_offset(port, port->txlast, 1);
u32 cda = sca_inw(dmac + CDAL, card);
+
if ((cda >= desc_off) && (cda < desc_off + sizeof(pkt_desc)))
break; /* Transmitter is/will_be sending this frame */
@@ -371,6 +372,7 @@ static irqreturn_t sca_intr(int irq, void* dev_id)
handled = 1;
for (i = 0; i < 2; i++) {
port_t *port = get_port(card, i);
+
if (port) {
if (stat & SCA_INTR_MSCI(i))
sca_msci_intr(port);
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net-next 3/8] net: hd64570: fix the code style issue about "foo* bar"
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 1/8] net: hd64570: remove redundant blank lines Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 2/8] net: hd64570: add blank line after declarations Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 4/8] net: hd64570: fix the code style issue about trailing statements Guangbin Huang
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Fix the checkpatch error as "foo* bar" and should be "foo *bar",
and "(foo*)" should be "(foo *)".
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index cca6101..6237da6 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -75,7 +75,7 @@ static inline int sca_intr_status(card_t *card)
return result;
}
-static inline port_t* dev_to_port(struct net_device *dev)
+static inline port_t *dev_to_port(struct net_device *dev)
{
return dev_to_hdlc(dev)->priv;
}
@@ -211,7 +211,7 @@ static void sca_init_port(port_t *port)
static inline void sca_msci_intr(port_t *port)
{
u16 msci = get_msci(port);
- card_t* card = port_to_card(port);
+ card_t *card = port_to_card(port);
u8 stat = sca_in(msci + ST1, card); /* read MSCI ST1 status */
/* Reset MSCI TX underrun and CDCD status bit */
@@ -329,7 +329,7 @@ static inline void sca_tx_intr(port_t *port)
{
struct net_device *dev = port_to_dev(port);
u16 dmac = get_dmac_tx(port);
- card_t* card = port_to_card(port);
+ card_t *card = port_to_card(port);
u8 stat;
spin_lock(&port->lock);
@@ -360,7 +360,7 @@ static inline void sca_tx_intr(port_t *port)
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;
int i;
@@ -392,7 +392,7 @@ static irqreturn_t sca_intr(int irq, void* dev_id)
static void sca_set_port(port_t *port)
{
- card_t* card = port_to_card(port);
+ card_t *card = port_to_card(port);
u16 msci = get_msci(port);
u8 md2 = sca_in(msci + MD2, card);
unsigned int tmc, br = 10, brv = 1024;
@@ -443,7 +443,7 @@ static void sca_set_port(port_t *port)
static void sca_open(struct net_device *dev)
{
port_t *port = dev_to_port(dev);
- card_t* card = port_to_card(port);
+ card_t *card = port_to_card(port);
u16 msci = get_msci(port);
u8 md0, md2;
@@ -506,7 +506,7 @@ static void sca_open(struct net_device *dev)
static void sca_close(struct net_device *dev)
{
port_t *port = dev_to_port(dev);
- card_t* card = port_to_card(port);
+ card_t *card = port_to_card(port);
/* reset channel */
sca_out(CMD_RESET, get_msci(port) + CMD, port_to_card(port));
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net-next 4/8] net: hd64570: fix the code style issue about trailing statements
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
` (2 preceding siblings ...)
2021-06-05 7:00 ` [PATCH net-next 3/8] net: hd64570: fix the code style issue about "foo* bar" Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 5/8] net: hd64570: add braces {} to all arms of the statement Guangbin Huang
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Trailing statements should be on next line.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 60 +++++++++++++++++++++++++++++++++--------------
1 file changed, 42 insertions(+), 18 deletions(-)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 6237da6..f02cce0 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -58,12 +58,18 @@ static inline int sca_intr_status(card_t *card)
u8 isr0 = sca_in(ISR0, card);
u8 isr1 = sca_in(ISR1, card);
- if (isr1 & 0x03) result |= SCA_INTR_DMAC_RX(0);
- if (isr1 & 0x0C) result |= SCA_INTR_DMAC_TX(0);
- if (isr1 & 0x30) result |= SCA_INTR_DMAC_RX(1);
- if (isr1 & 0xC0) result |= SCA_INTR_DMAC_TX(1);
- if (isr0 & 0x0F) result |= SCA_INTR_MSCI(0);
- if (isr0 & 0xF0) result |= SCA_INTR_MSCI(1);
+ if (isr1 & 0x03)
+ result |= SCA_INTR_DMAC_RX(0);
+ if (isr1 & 0x0C)
+ result |= SCA_INTR_DMAC_TX(0);
+ if (isr1 & 0x30)
+ result |= SCA_INTR_DMAC_RX(1);
+ if (isr1 & 0xC0)
+ result |= SCA_INTR_DMAC_TX(1);
+ if (isr0 & 0x0F)
+ result |= SCA_INTR_MSCI(0);
+ if (isr0 & 0xF0)
+ result |= SCA_INTR_MSCI(1);
if (!(result & SCA_INTR_DMAC_TX(0)))
if (sca_in(DSR_TX(0), card) & DSR_EOM)
@@ -447,23 +453,41 @@ static void sca_open(struct net_device *dev)
u16 msci = get_msci(port);
u8 md0, md2;
- switch(port->encoding) {
- case ENCODING_NRZ: md2 = MD2_NRZ; break;
- case ENCODING_NRZI: md2 = MD2_NRZI; break;
- case ENCODING_FM_MARK: md2 = MD2_FM_MARK; break;
- case ENCODING_FM_SPACE: md2 = MD2_FM_SPACE; break;
- default: md2 = MD2_MANCHESTER;
+ switch (port->encoding) {
+ case ENCODING_NRZ:
+ md2 = MD2_NRZ;
+ break;
+ case ENCODING_NRZI:
+ md2 = MD2_NRZI;
+ break;
+ case ENCODING_FM_MARK:
+ md2 = MD2_FM_MARK;
+ break;
+ case ENCODING_FM_SPACE:
+ md2 = MD2_FM_SPACE;
+ break;
+ default:
+ md2 = MD2_MANCHESTER;
}
if (port->settings.loopback)
md2 |= MD2_LOOPBACK;
- switch(port->parity) {
- case PARITY_CRC16_PR0: md0 = MD0_HDLC | MD0_CRC_16_0; break;
- case PARITY_CRC16_PR1: md0 = MD0_HDLC | MD0_CRC_16; break;
- case PARITY_CRC16_PR0_CCITT: md0 = MD0_HDLC | MD0_CRC_ITU_0; break;
- case PARITY_CRC16_PR1_CCITT: md0 = MD0_HDLC | MD0_CRC_ITU; break;
- default: md0 = MD0_HDLC | MD0_CRC_NONE;
+ switch (port->parity) {
+ case PARITY_CRC16_PR0:
+ md0 = MD0_HDLC | MD0_CRC_16_0;
+ break;
+ case PARITY_CRC16_PR1:
+ md0 = MD0_HDLC | MD0_CRC_16;
+ break;
+ case PARITY_CRC16_PR0_CCITT:
+ md0 = MD0_HDLC | MD0_CRC_ITU_0;
+ break;
+ case PARITY_CRC16_PR1_CCITT:
+ md0 = MD0_HDLC | MD0_CRC_ITU;
+ break;
+ default:
+ md0 = MD0_HDLC | MD0_CRC_NONE;
}
sca_out(CMD_RESET, msci + CMD, card);
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net-next 5/8] net: hd64570: add braces {} to all arms of the statement
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
` (3 preceding siblings ...)
2021-06-05 7:00 ` [PATCH net-next 4/8] net: hd64570: fix the code style issue about trailing statements Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 6/8] net: hd64570: fix the comments style issue Guangbin Huang
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Braces {} should be used on all arms of this statement.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index f02cce0..0297fbe 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -262,8 +262,9 @@ static inline void sca_rx(card_t *card, port_t *port, pkt_desc __iomem *desc,
memcpy_fromio(skb->data, winbase(card) + buff, maxlen);
openwin(card, page + 1);
memcpy_fromio(skb->data + maxlen, winbase(card), len - maxlen);
- } else
+ } else {
memcpy_fromio(skb->data, winbase(card) + buff, len);
+ }
#ifndef PAGE0_ALWAYS_MAPPED
openwin(card, 0); /* select pkt_desc table page back */
@@ -318,8 +319,9 @@ static inline void sca_rx_intr(port_t *port)
dev->stats.rx_crc_errors++;
if (stat & ST_RX_EOM)
port->rxpart = 0; /* received last fragment */
- } else
+ } else {
sca_rx(card, port, desc, port->rxin);
+ }
/* Set new error descriptor address */
sca_outw(desc_off, dmac + EDAL, card);
@@ -417,8 +419,9 @@ static void sca_set_port(port_t *port)
tmc = 1;
br = 0; /* For baud=CLOCK_BASE we use tmc=1 br=0 */
brv = 1;
- } else if (tmc > 255)
+ } else if (tmc > 255) {
tmc = 256; /* tmc=0 means 256 - low baud rates */
+ }
port->settings.clock_rate = CLOCK_BASE / brv / tmc;
} else {
@@ -651,8 +654,9 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev)
memcpy_toio(winbase(card) + buff, skb->data, maxlen);
openwin(card, page + 1);
memcpy_toio(winbase(card), skb->data + maxlen, len - maxlen);
- } else
+ } else {
memcpy_toio(winbase(card) + buff, skb->data, len);
+ }
#ifndef PAGE0_ALWAYS_MAPPED
openwin(card, 0); /* select pkt_desc table page back */
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net-next 6/8] net: hd64570: fix the comments style issue
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
` (4 preceding siblings ...)
2021-06-05 7:00 ` [PATCH net-next 5/8] net: hd64570: add braces {} to all arms of the statement Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 7/8] net: hd64570: remove redundant parentheses Guangbin Huang
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Block comments use * on subsequent lines.
Block comments use a trailing */ on a separate line.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 0297fbe..c6605ea 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -507,9 +507,9 @@ static void sca_open(struct net_device *dev)
sca_out(0x14, msci + TRC1, card); /* +1=TXRDY/DMA deactiv condition */
/* We're using the following interrupts:
- - TXINT (DMAC completed all transmisions, underrun or DCD change)
- - all DMA interrupts
-*/
+ * - TXINT (DMAC completed all transmisions, underrun or DCD change)
+ * - all DMA interrupts
+ */
sca_set_carrier(port);
/* MSCI TX INT and RX INT A IRQ enable */
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net-next 7/8] net: hd64570: remove redundant parentheses
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
` (5 preceding siblings ...)
2021-06-05 7:00 ` [PATCH net-next 6/8] net: hd64570: fix the comments style issue Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 8/8] net: hd64570: add some required spaces Guangbin Huang
2021-06-07 19:30 ` [PATCH net-next 0/8] net: hd64570: clean up some code style issues patchwork-bot+netdevbpf
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Remove redundant parentheses around 'cda >= desc_off'.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index c6605ea..8af647c 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -301,7 +301,7 @@ static inline void sca_rx_intr(port_t *port)
pkt_desc __iomem *desc;
u32 cda = sca_inw(dmac + CDAL, card);
- if ((cda >= desc_off) && (cda < desc_off + sizeof(pkt_desc)))
+ if (cda >= desc_off && (cda < desc_off + sizeof(pkt_desc)))
break; /* No frame received */
desc = desc_address(port, port->rxin, 0);
@@ -354,7 +354,7 @@ static inline void sca_tx_intr(port_t *port)
u32 desc_off = desc_offset(port, port->txlast, 1);
u32 cda = sca_inw(dmac + CDAL, card);
- if ((cda >= desc_off) && (cda < desc_off + sizeof(pkt_desc)))
+ if (cda >= desc_off && (cda < desc_off + sizeof(pkt_desc)))
break; /* Transmitter is/will_be sending this frame */
desc = desc_address(port, port->txlast, 1);
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH net-next 8/8] net: hd64570: add some required spaces
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
` (6 preceding siblings ...)
2021-06-05 7:00 ` [PATCH net-next 7/8] net: hd64570: remove redundant parentheses Guangbin Huang
@ 2021-06-05 7:00 ` Guangbin Huang
2021-06-07 19:30 ` [PATCH net-next 0/8] net: hd64570: clean up some code style issues patchwork-bot+netdevbpf
8 siblings, 0 replies; 10+ messages in thread
From: Guangbin Huang @ 2021-06-05 7:00 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Add space required before the open parenthesis '('.
Add space required after that close brace '}'.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hd64570.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c
index 8af647c..0d19e39 100644
--- a/drivers/net/wan/hd64570.c
+++ b/drivers/net/wan/hd64570.c
@@ -376,7 +376,7 @@ static irqreturn_t sca_intr(int irq, void *dev_id)
int handled = 0;
u8 page = sca_get_page(card);
- while((stat = sca_intr_status(card)) != 0) {
+ while ((stat = sca_intr_status(card)) != 0) {
handled = 1;
for (i = 0; i < 2; i++) {
port_t *port = get_port(card, i);
@@ -413,7 +413,7 @@ static void sca_set_port(port_t *port)
/* Baud Rate = CLOCK_BASE / TMC / 2^BR */
tmc = CLOCK_BASE / brv / port->settings.clock_rate;
- }while (br > 1 && tmc <= 128);
+ } while (br > 1 && tmc <= 128);
if (tmc < 1) {
tmc = 1;
--
2.8.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH net-next 0/8] net: hd64570: clean up some code style issues
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
` (7 preceding siblings ...)
2021-06-05 7:00 ` [PATCH net-next 8/8] net: hd64570: add some required spaces Guangbin Huang
@ 2021-06-07 19:30 ` patchwork-bot+netdevbpf
8 siblings, 0 replies; 10+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-06-07 19:30 UTC (permalink / raw)
To: Guangbin Huang
Cc: davem, kuba, xie.he.0141, ms, willemb, netdev, linux-kernel, lipeng321
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Sat, 5 Jun 2021 15:00:21 +0800 you wrote:
> From: Peng Li <lipeng321@huawei.com>
>
> This patchset clean up some code style issues.
>
> Peng Li (8):
> net: hd64570: remove redundant blank lines
> net: hd64570: add blank line after declarations
> net: hd64570: fix the code style issue about "foo* bar"
> net: hd64570: fix the code style issue about trailing statements
> net: hd64570: add braces {} to all arms of the statement
> net: hd64570: fix the comments style issue
> net: hd64570: remove redundant parentheses
> net: hd64570: add some required spaces
>
> [...]
Here is the summary with links:
- [net-next,1/8] net: hd64570: remove redundant blank lines
https://git.kernel.org/netdev/net-next/c/725637a802c5
- [net-next,2/8] net: hd64570: add blank line after declarations
https://git.kernel.org/netdev/net-next/c/d364c0a93ac6
- [net-next,3/8] net: hd64570: fix the code style issue about "foo* bar"
https://git.kernel.org/netdev/net-next/c/1d1fa598ac19
- [net-next,4/8] net: hd64570: fix the code style issue about trailing statements
https://git.kernel.org/netdev/net-next/c/bc94e642e4bd
- [net-next,5/8] net: hd64570: add braces {} to all arms of the statement
https://git.kernel.org/netdev/net-next/c/3f8b8db695fe
- [net-next,6/8] net: hd64570: fix the comments style issue
https://git.kernel.org/netdev/net-next/c/53da5342c51a
- [net-next,7/8] net: hd64570: remove redundant parentheses
https://git.kernel.org/netdev/net-next/c/cb625e9c5d48
- [net-next,8/8] net: hd64570: add some required spaces
https://git.kernel.org/netdev/net-next/c/0f1e7a34c053
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2021-06-07 19:30 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-05 7:00 [PATCH net-next 0/8] net: hd64570: clean up some code style issues Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 1/8] net: hd64570: remove redundant blank lines Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 2/8] net: hd64570: add blank line after declarations Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 3/8] net: hd64570: fix the code style issue about "foo* bar" Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 4/8] net: hd64570: fix the code style issue about trailing statements Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 5/8] net: hd64570: add braces {} to all arms of the statement Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 6/8] net: hd64570: fix the comments style issue Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 7/8] net: hd64570: remove redundant parentheses Guangbin Huang
2021-06-05 7:00 ` [PATCH net-next 8/8] net: hd64570: add some required spaces Guangbin Huang
2021-06-07 19:30 ` [PATCH net-next 0/8] net: hd64570: clean up some code style issues patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).