* [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues
@ 2021-05-28 0:12 Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 01/10] net: hdlc_fr: remove redundant blank lines Guangbin Huang
` (10 more replies)
0 siblings, 11 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
This patchset clean up some code style issues.
---
Change log:
V1 -> V2:
1, Use appropriate commit prefix suggested by Jakub Kicinski,
replace commit prefix "net: wan" by "net: hdlc_fr".
---
Peng Li (10):
net: hdlc_fr: remove redundant blank lines
net: hdlc_fr: add blank line after declarations
net: hdlc_fr: fix an code style issue about "foo* bar"
net: hdlc_fr: add some required spaces
net: hdlc_fr: move out assignment in if condition
net: hdlc_fr: code indent use tabs where possible
net: hdlc_fr: remove space after '!'
net: hdlc_fr: add braces {} to all arms of the statement
net: hdlc_fr: remove redundant braces {}
net: hdlc_fr: remove unnecessary out of memory message
drivers/net/wan/hdlc_fr.c | 101 ++++++++++++++++------------------------------
1 file changed, 34 insertions(+), 67 deletions(-)
--
2.8.1
^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 01/10] net: hdlc_fr: remove redundant blank lines
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 02/10] net: hdlc_fr: add blank line after declarations Guangbin Huang
` (9 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, 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/hdlc_fr.c | 42 ------------------------------------------
1 file changed, 42 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 0720f5f..0b6e133 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -60,7 +60,6 @@
#define NLPID_CCITT_ANSI_LMI 0x08
#define NLPID_CISCO_LMI 0x09
-
#define LMI_CCITT_ANSI_DLCI 0 /* LMI DLCI */
#define LMI_CISCO_DLCI 1023
@@ -86,7 +85,6 @@
#define LMI_CCITT_CISCO_LENGTH 13 /* LMI frame lengths */
#define LMI_ANSI_LENGTH 14
-
struct fr_hdr {
#if defined(__LITTLE_ENDIAN_BITFIELD)
unsigned ea1: 1;
@@ -111,7 +109,6 @@ struct fr_hdr {
#endif
} __packed;
-
struct pvc_device {
struct net_device *frad;
struct net_device *main;
@@ -149,29 +146,24 @@ struct frad_state {
u8 rxseq; /* RX sequence number */
};
-
static int fr_ioctl(struct net_device *dev, struct ifreq *ifr);
-
static inline u16 q922_to_dlci(u8 *hdr)
{
return ((hdr[0] & 0xFC) << 2) | ((hdr[1] & 0xF0) >> 4);
}
-
static inline void dlci_to_q922(u8 *hdr, u16 dlci)
{
hdr[0] = (dlci >> 2) & 0xFC;
hdr[1] = ((dlci << 4) & 0xF0) | 0x01;
}
-
static inline struct frad_state* state(hdlc_device *hdlc)
{
return(struct frad_state *)(hdlc->state);
}
-
static inline struct pvc_device *find_pvc(hdlc_device *hdlc, u16 dlci)
{
struct pvc_device *pvc = state(hdlc)->first_pvc;
@@ -187,7 +179,6 @@ static inline struct pvc_device *find_pvc(hdlc_device *hdlc, u16 dlci)
return NULL;
}
-
static struct pvc_device *add_pvc(struct net_device *dev, u16 dlci)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -215,13 +206,11 @@ static struct pvc_device *add_pvc(struct net_device *dev, u16 dlci)
return pvc;
}
-
static inline int pvc_is_used(struct pvc_device *pvc)
{
return pvc->main || pvc->ether;
}
-
static inline void pvc_carrier(int on, struct pvc_device *pvc)
{
if (on) {
@@ -241,7 +230,6 @@ static inline void pvc_carrier(int on, struct pvc_device *pvc)
}
}
-
static inline void delete_unused_pvcs(hdlc_device *hdlc)
{
struct pvc_device **pvc_p = &state(hdlc)->first_pvc;
@@ -260,7 +248,6 @@ static inline void delete_unused_pvcs(hdlc_device *hdlc)
}
}
-
static inline struct net_device **get_dev_p(struct pvc_device *pvc,
int type)
{
@@ -270,7 +257,6 @@ static inline struct net_device **get_dev_p(struct pvc_device *pvc,
return &pvc->main;
}
-
static int fr_hard_header(struct sk_buff *skb, u16 dlci)
{
if (!skb->dev) { /* Control packets */
@@ -334,8 +320,6 @@ static int fr_hard_header(struct sk_buff *skb, u16 dlci)
return 0;
}
-
-
static int pvc_open(struct net_device *dev)
{
struct pvc_device *pvc = dev->ml_priv;
@@ -354,8 +338,6 @@ static int pvc_open(struct net_device *dev)
return 0;
}
-
-
static int pvc_close(struct net_device *dev)
{
struct pvc_device *pvc = dev->ml_priv;
@@ -373,8 +355,6 @@ static int pvc_close(struct net_device *dev)
return 0;
}
-
-
static int pvc_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct pvc_device *pvc = dev->ml_priv;
@@ -465,15 +445,12 @@ static inline void fr_log_dlci_active(struct pvc_device *pvc)
pvc->state.active ? "active" : "inactive");
}
-
-
static inline u8 fr_lmi_nextseq(u8 x)
{
x++;
return x ? x : 1;
}
-
static void fr_lmi_send(struct net_device *dev, int fullrep)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -569,8 +546,6 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
dev_queue_xmit(skb);
}
-
-
static void fr_set_link_state(int reliable, struct net_device *dev)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -603,7 +578,6 @@ static void fr_set_link_state(int reliable, struct net_device *dev)
}
}
-
static void fr_timer(struct timer_list *t)
{
struct frad_state *st = from_timer(st, t, timer);
@@ -655,7 +629,6 @@ static void fr_timer(struct timer_list *t)
add_timer(&state(hdlc)->timer);
}
-
static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -962,7 +935,6 @@ static int fr_rx(struct sk_buff *skb)
pvc->state.becn ^= 1;
}
-
if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
frad->stats.rx_dropped++;
return NET_RX_DROP;
@@ -1018,8 +990,6 @@ static int fr_rx(struct sk_buff *skb)
return NET_RX_DROP;
}
-
-
static void fr_start(struct net_device *dev)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -1044,7 +1014,6 @@ static void fr_start(struct net_device *dev)
fr_set_link_state(1, dev);
}
-
static void fr_stop(struct net_device *dev)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -1056,7 +1025,6 @@ static void fr_stop(struct net_device *dev)
fr_set_link_state(0, dev);
}
-
static void fr_close(struct net_device *dev)
{
hdlc_device *hdlc = dev_to_hdlc(dev);
@@ -1071,7 +1039,6 @@ static void fr_close(struct net_device *dev)
}
}
-
static void pvc_setup(struct net_device *dev)
{
dev->type = ARPHRD_DLCI;
@@ -1147,8 +1114,6 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
return 0;
}
-
-
static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type)
{
struct pvc_device *pvc;
@@ -1174,8 +1139,6 @@ static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type)
return 0;
}
-
-
static void fr_destroy(struct net_device *frad)
{
hdlc_device *hdlc = dev_to_hdlc(frad);
@@ -1198,7 +1161,6 @@ static void fr_destroy(struct net_device *frad)
}
}
-
static struct hdlc_proto proto = {
.close = fr_close,
.start = fr_start,
@@ -1209,7 +1171,6 @@ static struct hdlc_proto proto = {
.module = THIS_MODULE,
};
-
static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
{
fr_proto __user *fr_s = ifr->ifr_settings.ifs_ifsu.fr;
@@ -1309,20 +1270,17 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
return -EINVAL;
}
-
static int __init mod_init(void)
{
register_hdlc_protocol(&proto);
return 0;
}
-
static void __exit mod_exit(void)
{
unregister_hdlc_protocol(&proto);
}
-
module_init(mod_init);
module_exit(mod_exit);
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 02/10] net: hdlc_fr: add blank line after declarations
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 01/10] net: hdlc_fr: remove redundant blank lines Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 03/10] net: hdlc_fr: fix an code style issue about "foo* bar" Guangbin Huang
` (8 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, 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/hdlc_fr.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 0b6e133..96e4a89 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -329,6 +329,7 @@ static int pvc_open(struct net_device *dev)
if (pvc->open_count++ == 0) {
hdlc_device *hdlc = dev_to_hdlc(pvc->frad);
+
if (state(hdlc)->settings.lmi == LMI_NONE)
pvc->state.active = netif_carrier_ok(pvc->frad);
@@ -344,6 +345,7 @@ static int pvc_close(struct net_device *dev)
if (--pvc->open_count == 0) {
hdlc_device *hdlc = dev_to_hdlc(pvc->frad);
+
if (state(hdlc)->settings.lmi == LMI_NONE)
pvc->state.active = 0;
@@ -1143,6 +1145,7 @@ static void fr_destroy(struct net_device *frad)
{
hdlc_device *hdlc = dev_to_hdlc(frad);
struct pvc_device *pvc = state(hdlc)->first_pvc;
+
state(hdlc)->first_pvc = NULL; /* All PVCs destroyed */
state(hdlc)->dce_pvc_count = 0;
state(hdlc)->dce_changed = 1;
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 03/10] net: hdlc_fr: fix an code style issue about "foo* bar"
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 01/10] net: hdlc_fr: remove redundant blank lines Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 02/10] net: hdlc_fr: add blank line after declarations Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 04/10] net: hdlc_fr: add some required spaces Guangbin Huang
` (7 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, 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/hdlc_fr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 96e4a89..4a6172c 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -159,7 +159,7 @@ static inline void dlci_to_q922(u8 *hdr, u16 dlci)
hdr[1] = ((dlci << 4) & 0xF0) | 0x01;
}
-static inline struct frad_state* state(hdlc_device *hdlc)
+static inline struct frad_state *state(hdlc_device *hdlc)
{
return(struct frad_state *)(hdlc->state);
}
@@ -1090,7 +1090,7 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
dev->priv_flags &= ~IFF_TX_SKB_SHARING;
eth_hw_addr_random(dev);
} else {
- *(__be16*)dev->dev_addr = htons(dlci);
+ *(__be16 *)dev->dev_addr = htons(dlci);
dlci_to_q922(dev->broadcast, dlci);
}
dev->netdev_ops = &pvc_ops;
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 04/10] net: hdlc_fr: add some required spaces
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (2 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 03/10] net: hdlc_fr: fix an code style issue about "foo* bar" Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 05/10] net: hdlc_fr: move out assignment in if condition Guangbin Huang
` (6 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Add spaces required after that close brace '}'.
Add spaces required before the open parenthesis '('.
Add spaces required after that ','.
Add spaces required around that '='.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 4a6172c..512ef79 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -125,7 +125,7 @@ struct pvc_device {
unsigned int fecn: 1;
unsigned int becn: 1;
unsigned int bandwidth; /* Cisco LMI reporting only */
- }state;
+ } state;
};
struct frad_state {
@@ -161,7 +161,7 @@ static inline void dlci_to_q922(u8 *hdr, u16 dlci)
static inline struct frad_state *state(hdlc_device *hdlc)
{
- return(struct frad_state *)(hdlc->state);
+ return (struct frad_state *)(hdlc->state);
}
static inline struct pvc_device *find_pvc(hdlc_device *hdlc, u16 dlci)
@@ -1223,7 +1223,8 @@ static int fr_ioctl(struct net_device *dev, struct ifreq *ifr)
new_settings.dce != 1))
return -EINVAL;
- result=hdlc->attach(dev, ENCODING_NRZ,PARITY_CRC16_PR1_CCITT);
+ result = hdlc->attach(dev, ENCODING_NRZ,
+ PARITY_CRC16_PR1_CCITT);
if (result)
return result;
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 05/10] net: hdlc_fr: move out assignment in if condition
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (3 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 04/10] net: hdlc_fr: add some required spaces Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 06/10] net: hdlc_fr: code indent use tabs where possible Guangbin Huang
` (5 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Should not use assignment in if condition.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 512ef79..a39e508 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -937,7 +937,8 @@ static int fr_rx(struct sk_buff *skb)
pvc->state.becn ^= 1;
}
- if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL) {
+ skb = skb_share_check(skb, GFP_ATOMIC);
+ if (!skb) {
frad->stats.rx_dropped++;
return NET_RX_DROP;
}
@@ -1064,7 +1065,8 @@ static int fr_add_pvc(struct net_device *frad, unsigned int dlci, int type)
struct net_device *dev;
int used;
- if ((pvc = add_pvc(frad, dlci)) == NULL) {
+ pvc = add_pvc(frad, dlci);
+ if (!pvc) {
netdev_warn(frad, "Memory squeeze on fr_add_pvc()\n");
return -ENOBUFS;
}
@@ -1121,10 +1123,12 @@ static int fr_del_pvc(hdlc_device *hdlc, unsigned int dlci, int type)
struct pvc_device *pvc;
struct net_device *dev;
- if ((pvc = find_pvc(hdlc, dlci)) == NULL)
+ pvc = find_pvc(hdlc, dlci);
+ if (!pvc)
return -ENOENT;
- if ((dev = *get_dev_p(pvc, type)) == NULL)
+ dev = *get_dev_p(pvc, type);
+ if (!dev)
return -ENOENT;
if (dev->flags & IFF_UP)
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 06/10] net: hdlc_fr: code indent use tabs where possible
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (4 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 05/10] net: hdlc_fr: move out assignment in if condition Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 07/10] net: hdlc_fr: remove space after '!' Guangbin Huang
` (4 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
Code indent should use tabs where possible.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index a39e508..fa10eea 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -6,16 +6,16 @@
* Copyright (C) 1999 - 2006 Krzysztof Halasa <khc@pm.waw.pl>
*
- Theory of PVC state
+ Theory of PVC state
DCE mode:
(exist,new) -> 0,0 when "PVC create" or if "link unreliable"
- 0,x -> 1,1 if "link reliable" when sending FULL STATUS
- 1,1 -> 1,0 if received FULL STATUS ACK
+ 0,x -> 1,1 if "link reliable" when sending FULL STATUS
+ 1,1 -> 1,0 if received FULL STATUS ACK
(active) -> 0 when "ifconfig PVC down" or "link unreliable" or "PVC create"
- -> 1 when "PVC up" and (exist,new) = 1,0
+ -> 1 when "PVC up" and (exist,new) = 1,0
DTE mode:
(exist,new,active) = FULL STATUS if "link reliable"
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 07/10] net: hdlc_fr: remove space after '!'
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (5 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 06/10] net: hdlc_fr: code indent use tabs where possible Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 08/10] net: hdlc_fr: add braces {} to all arms of the statement Guangbin Huang
` (3 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
According to the chackpatch.pl, space prohibited after that '!'.
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index fa10eea..77b4f65 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -789,8 +789,8 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
}
i++;
- new = !! (skb->data[i + 2] & 0x08);
- active = !! (skb->data[i + 2] & 0x02);
+ new = !!(skb->data[i + 2] & 0x08);
+ active = !!(skb->data[i + 2] & 0x02);
if (lmi == LMI_CISCO) {
dlci = (skb->data[i] << 8) | skb->data[i + 1];
bw = (skb->data[i + 3] << 16) |
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 08/10] net: hdlc_fr: add braces {} to all arms of the statement
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (6 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 07/10] net: hdlc_fr: remove space after '!' Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 09/10] net: hdlc_fr: remove redundant braces {} Guangbin Huang
` (2 subsequent siblings)
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, 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/hdlc_fr.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 77b4f65..5c2a2ec 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -613,10 +613,10 @@ static void fr_timer(struct timer_list *t)
fr_set_link_state(reliable, dev);
}
- if (state(hdlc)->settings.dce)
+ if (state(hdlc)->settings.dce) {
state(hdlc)->timer.expires = jiffies +
state(hdlc)->settings.t392 * HZ;
- else {
+ } else {
if (state(hdlc)->n391cnt)
state(hdlc)->n391cnt--;
@@ -671,8 +671,9 @@ static int fr_lmi_recv(struct net_device *dev, struct sk_buff *skb)
return 1;
}
i = 7;
- } else
+ } else {
i = 6;
+ }
if (skb->data[i] != (lmi == LMI_CCITT ? LMI_CCITT_REPTYPE :
LMI_ANSI_CISCO_REPTYPE)) {
@@ -1013,8 +1014,9 @@ static void fr_start(struct net_device *dev)
/* First poll after 1 s */
state(hdlc)->timer.expires = jiffies + HZ;
add_timer(&state(hdlc)->timer);
- } else
+ } else {
fr_set_link_state(1, dev);
+ }
}
static void fr_stop(struct net_device *dev)
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 09/10] net: hdlc_fr: remove redundant braces {}
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (7 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 08/10] net: hdlc_fr: add braces {} to all arms of the statement Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 10/10] net: hdlc_fr: remove unnecessary out of memory message Guangbin Huang
2021-05-28 21:20 ` [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues patchwork-bot+netdevbpf
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
This patch removes redundant braces {}, to fix the
checkpatch.pl warning:
"braces {} are not necessary for any arm of this statement"
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index 5c2a2ec..de7fbdc 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -480,11 +480,11 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
}
memset(skb->data, 0, len);
skb_reserve(skb, 4);
- if (lmi == LMI_CISCO) {
+ if (lmi == LMI_CISCO)
fr_hard_header(skb, LMI_CISCO_DLCI);
- } else {
+ else
fr_hard_header(skb, LMI_CCITT_ANSI_DLCI);
- }
+
data = skb_tail_pointer(skb);
data[i++] = LMI_CALLREF;
data[i++] = dce ? LMI_STATUS : LMI_STATUS_ENQUIRY;
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH V2 net-next 10/10] net: hdlc_fr: remove unnecessary out of memory message
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (8 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 09/10] net: hdlc_fr: remove redundant braces {} Guangbin Huang
@ 2021-05-28 0:12 ` Guangbin Huang
2021-05-28 21:20 ` [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues patchwork-bot+netdevbpf
10 siblings, 0 replies; 12+ messages in thread
From: Guangbin Huang @ 2021-05-28 0:12 UTC (permalink / raw)
To: davem, kuba, xie.he.0141, ms, willemb
Cc: netdev, linux-kernel, lipeng321, tanhuazhong, huangguangbin2
From: Peng Li <lipeng321@huawei.com>
This patch removes unnecessary out of memory message,
to fix the following checkpatch.pl warning:
"WARNING: Possible unnecessary 'out of memory' message"
Signed-off-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
---
drivers/net/wan/hdlc_fr.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/net/wan/hdlc_fr.c b/drivers/net/wan/hdlc_fr.c
index de7fbdc..72250fe 100644
--- a/drivers/net/wan/hdlc_fr.c
+++ b/drivers/net/wan/hdlc_fr.c
@@ -474,10 +474,9 @@ static void fr_lmi_send(struct net_device *dev, int fullrep)
}
skb = dev_alloc_skb(len);
- if (!skb) {
- netdev_warn(dev, "Memory squeeze on fr_lmi_send()\n");
+ if (!skb)
return;
- }
+
memset(skb->data, 0, len);
skb_reserve(skb, 4);
if (lmi == LMI_CISCO)
--
2.8.1
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
` (9 preceding siblings ...)
2021-05-28 0:12 ` [PATCH V2 net-next 10/10] net: hdlc_fr: remove unnecessary out of memory message Guangbin Huang
@ 2021-05-28 21:20 ` patchwork-bot+netdevbpf
10 siblings, 0 replies; 12+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-05-28 21:20 UTC (permalink / raw)
To: Guangbin Huang
Cc: davem, kuba, xie.he.0141, ms, willemb, netdev, linux-kernel,
lipeng321, tanhuazhong
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Fri, 28 May 2021 08:12:39 +0800 you wrote:
> From: Peng Li <lipeng321@huawei.com>
>
> This patchset clean up some code style issues.
>
> ---
> Change log:
> V1 -> V2:
> 1, Use appropriate commit prefix suggested by Jakub Kicinski,
> replace commit prefix "net: wan" by "net: hdlc_fr".
>
> [...]
Here is the summary with links:
- [V2,net-next,01/10] net: hdlc_fr: remove redundant blank lines
https://git.kernel.org/netdev/net-next/c/b11faec36870
- [V2,net-next,02/10] net: hdlc_fr: add blank line after declarations
https://git.kernel.org/netdev/net-next/c/4a9ab454ae9b
- [V2,net-next,03/10] net: hdlc_fr: fix an code style issue about "foo* bar"
https://git.kernel.org/netdev/net-next/c/7aad06425991
- [V2,net-next,04/10] net: hdlc_fr: add some required spaces
https://git.kernel.org/netdev/net-next/c/30e7720d379a
- [V2,net-next,05/10] net: hdlc_fr: move out assignment in if condition
https://git.kernel.org/netdev/net-next/c/168a196ffcff
- [V2,net-next,06/10] net: hdlc_fr: code indent use tabs where possible
https://git.kernel.org/netdev/net-next/c/683b54bb468f
- [V2,net-next,07/10] net: hdlc_fr: remove space after '!'
https://git.kernel.org/netdev/net-next/c/8f032c6535fe
- [V2,net-next,08/10] net: hdlc_fr: add braces {} to all arms of the statement
https://git.kernel.org/netdev/net-next/c/5d650a6c7b9c
- [V2,net-next,09/10] net: hdlc_fr: remove redundant braces {}
https://git.kernel.org/netdev/net-next/c/c9a2ca5d7e58
- [V2,net-next,10/10] net: hdlc_fr: remove unnecessary out of memory message
https://git.kernel.org/netdev/net-next/c/2744fa2dfdcd
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] 12+ messages in thread
end of thread, other threads:[~2021-05-28 21:20 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-28 0:12 [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 01/10] net: hdlc_fr: remove redundant blank lines Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 02/10] net: hdlc_fr: add blank line after declarations Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 03/10] net: hdlc_fr: fix an code style issue about "foo* bar" Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 04/10] net: hdlc_fr: add some required spaces Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 05/10] net: hdlc_fr: move out assignment in if condition Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 06/10] net: hdlc_fr: code indent use tabs where possible Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 07/10] net: hdlc_fr: remove space after '!' Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 08/10] net: hdlc_fr: add braces {} to all arms of the statement Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 09/10] net: hdlc_fr: remove redundant braces {} Guangbin Huang
2021-05-28 0:12 ` [PATCH V2 net-next 10/10] net: hdlc_fr: remove unnecessary out of memory message Guangbin Huang
2021-05-28 21:20 ` [PATCH V2 net-next 00/10] net: hdlc_fr: clean up some code style issues patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.