This patchset clean up some code style issues.
Peng Li (10):
net: sealevel: remove redundant blank lines
net: sealevel: add blank line after declarations
net: sealevel: fix the code style issue about "foo* bar"
net: sealevel: open brace '{' following struct go on the same line
net: sealevel: add some required spaces
net: sealevel: remove redundant initialization for statics
net: sealevel: fix a code style issue about switch and case
net: sealevel: remove meaningless comments
net: sealevel: fix the comments style issue
net: sealevel: fix the alignment issue
drivers/net/wan/sealevel.c | 126 +++++++++++++++++----------------------------
1 file changed, 47 insertions(+), 79 deletions(-)
--
2.8.1
From: Peng Li <[email protected]>
Should not initialise statics to false.
Signed-off-by: Peng Li <[email protected]>
Signed-off-by: Guangbin Huang <[email protected]>
---
drivers/net/wan/sealevel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index be618fd0b9a8..d19e9024865f 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -351,7 +351,7 @@ static int io = 0x238;
static int txdma = 1;
static int rxdma = 3;
static int irq = 5;
-static bool slow=false;
+static bool slow;
module_param_hw(io, int, ioport, 0);
MODULE_PARM_DESC(io, "The I/O base of the Sealevel card");
--
2.8.1
From: Peng Li <[email protected]>
According to the chackpatch.pl, switch and case should be
at the same indent.
Signed-off-by: Peng Li <[email protected]>
Signed-off-by: Guangbin Huang <[email protected]>
---
drivers/net/wan/sealevel.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index d19e9024865f..e07309e0d971 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -79,12 +79,12 @@ static int sealevel_open(struct net_device *d)
*/
switch (unit) {
- case 0:
- err = z8530_sync_dma_open(d, slvl->chan);
- break;
- case 1:
- err = z8530_sync_open(d, slvl->chan);
- break;
+ case 0:
+ err = z8530_sync_dma_open(d, slvl->chan);
+ break;
+ case 1:
+ err = z8530_sync_open(d, slvl->chan);
+ break;
}
if (err)
@@ -93,12 +93,12 @@ static int sealevel_open(struct net_device *d)
err = hdlc_open(d);
if (err) {
switch (unit) {
- case 0:
- z8530_sync_dma_close(d, slvl->chan);
- break;
- case 1:
- z8530_sync_close(d, slvl->chan);
- break;
+ case 0:
+ z8530_sync_dma_close(d, slvl->chan);
+ break;
+ case 1:
+ z8530_sync_close(d, slvl->chan);
+ break;
}
return err;
}
@@ -127,12 +127,12 @@ static int sealevel_close(struct net_device *d)
netif_stop_queue(d);
switch (unit) {
- case 0:
- z8530_sync_dma_close(d, slvl->chan);
- break;
- case 1:
- z8530_sync_close(d, slvl->chan);
- break;
+ case 0:
+ z8530_sync_dma_close(d, slvl->chan);
+ break;
+ case 1:
+ z8530_sync_close(d, slvl->chan);
+ break;
}
return 0;
}
--
2.8.1
From: Peng Li <[email protected]>
Alignment should match open parenthesis.
Signed-off-by: Peng Li <[email protected]>
Signed-off-by: Guangbin Huang <[email protected]>
---
drivers/net/wan/sealevel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 60028cfaaab5..4403e219ca03 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -135,7 +135,7 @@ static int sealevel_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
/* Passed network frames, fire them downwind. */
static netdev_tx_t sealevel_queue_xmit(struct sk_buff *skb,
- struct net_device *d)
+ struct net_device *d)
{
return z8530_queue_xmit(dev_to_chan(d)->chan, skb);
}
--
2.8.1
From: Peng Li <[email protected]>
Networking block comments don't use an empty /* line,
use /* Comment...
Block comments use * on subsequent lines.
Block comments use a trailing */ on a separate line.
This patch fixes the comments style issues.
Signed-off-by: Peng Li <[email protected]>
Signed-off-by: Guangbin Huang <[email protected]>
---
drivers/net/wan/sealevel.c | 60 ++++++++++++++--------------------------------
1 file changed, 18 insertions(+), 42 deletions(-)
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 6665732f96ce..60028cfaaab5 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later
-/*
- * Sealevel Systems 4021 driver.
+/* Sealevel Systems 4021 driver.
*
* (c) Copyright 1999, 2001 Alan Cox
* (c) Copyright 2001 Red Hat Inc.
@@ -40,17 +39,14 @@ struct slvl_board {
int iobase;
};
-/*
- * Network driver support routines
- */
+ /* Network driver support routines */
static inline struct slvl_device *dev_to_chan(struct net_device *dev)
{
return (struct slvl_device *)dev_to_hdlc(dev)->priv;
}
-/*
- * Frame receive. Simple for our card as we do HDLC and there
+/* Frame receive. Simple for our card as we do HDLC and there
* is no funny garbage involved
*/
@@ -64,9 +60,7 @@ static void sealevel_input(struct z8530_channel *c, struct sk_buff *skb)
netif_rx(skb);
}
-/*
- * We've been placed in the UP state
- */
+ /* We've been placed in the UP state */
static int sealevel_open(struct net_device *d)
{
@@ -74,9 +68,7 @@ static int sealevel_open(struct net_device *d)
int err = -1;
int unit = slvl->channel;
- /*
- * Link layer up.
- */
+ /* Link layer up. */
switch (unit) {
case 0:
@@ -114,9 +106,7 @@ static int sealevel_close(struct net_device *d)
struct slvl_device *slvl = dev_to_chan(d);
int unit = slvl->channel;
- /*
- * Discard new frames
- */
+ /* Discard new frames */
slvl->chan->rx_function = z8530_null_rx;
@@ -137,13 +127,12 @@ static int sealevel_close(struct net_device *d)
static int sealevel_ioctl(struct net_device *d, struct ifreq *ifr, int cmd)
{
/* struct slvl_device *slvl=dev_to_chan(d);
- z8530_ioctl(d,&slvl->sync.chanA,ifr,cmd) */
+ * z8530_ioctl(d,&slvl->sync.chanA,ifr,cmd)
+ */
return hdlc_ioctl(d, ifr, cmd);
}
-/*
- * Passed network frames, fire them downwind.
- */
+/* Passed network frames, fire them downwind. */
static netdev_tx_t sealevel_queue_xmit(struct sk_buff *skb,
struct net_device *d)
@@ -189,9 +178,7 @@ static int slvl_setup(struct slvl_device *sv, int iobase, int irq)
return 0;
}
-/*
- * Allocate and setup Sealevel board.
- */
+/* Allocate and setup Sealevel board. */
static __init struct slvl_board *slvl_init(int iobase, int irq,
int txdma, int rxdma, int slow)
@@ -199,9 +186,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
struct z8530_dev *dev;
struct slvl_board *b;
- /*
- * Get the needed I/O space
- */
+ /* Get the needed I/O space */
if (!request_region(iobase, 8, "Sealevel 4021")) {
pr_warn("I/O 0x%X already in use\n", iobase);
@@ -220,17 +205,13 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
dev = &b->board;
- /*
- * Stuff in the I/O addressing
- */
+ /* Stuff in the I/O addressing */
dev->active = 0;
b->iobase = iobase;
- /*
- * Select 8530 delays for the old board
- */
+ /* Select 8530 delays for the old board */
if (slow)
iobase |= Z8530_PORT_SLEEP;
@@ -243,14 +224,13 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
dev->chanA.irqs = &z8530_nop;
dev->chanB.irqs = &z8530_nop;
- /*
- * Assert DTR enable DMA
- */
+ /* Assert DTR enable DMA */
outb(3 | (1 << 7), b->iobase + 4);
/* We want a fast IRQ for this device. Actually we'd like an even faster
- IRQ ;) - This is one driver RtLinux is made for */
+ * IRQ ;) - This is one driver RtLinux is made for
+ */
if (request_irq(irq, z8530_interrupt, 0,
"SeaLevel", dev) < 0) {
@@ -274,9 +254,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
disable_irq(irq);
- /*
- * Begin normal initialise
- */
+ /* Begin normal initialise */
if (z8530_init(dev) != 0) {
pr_err("Z8530 series device not found\n");
@@ -291,9 +269,7 @@ static __init struct slvl_board *slvl_init(int iobase, int irq,
z8530_channel_load(&dev->chanB, z8530_hdlc_kilostream_85230);
}
- /*
- * Now we can take the IRQ
- */
+ /* Now we can take the IRQ */
enable_irq(irq);
--
2.8.1
From: Peng Li <[email protected]>
Fix the checkpatch error as "(foo*)" should be "(foo *)".
Signed-off-by: Peng Li <[email protected]>
Signed-off-by: Guangbin Huang <[email protected]>
---
drivers/net/wan/sealevel.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index 829e9bc01a49..465c9ace1dc7 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -46,7 +46,7 @@ struct slvl_board
* Network driver support routines
*/
-static inline struct slvl_device* dev_to_chan(struct net_device *dev)
+static inline struct slvl_device *dev_to_chan(struct net_device *dev)
{
return (struct slvl_device *)dev_to_hdlc(dev)->priv;
}
--
2.8.1
From: Peng Li <[email protected]>
Remove the meaningless stylistically wrong comment.
Signed-off-by: Peng Li <[email protected]>
Signed-off-by: Guangbin Huang <[email protected]>
---
drivers/net/wan/sealevel.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index e07309e0d971..6665732f96ce 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -105,9 +105,6 @@ static int sealevel_open(struct net_device *d)
slvl->chan->rx_function = sealevel_input;
- /*
- * Go go go
- */
netif_start_queue(d);
return 0;
}
--
2.8.1
From: Peng Li <[email protected]>
Add spaces required around that '='.
Signed-off-by: Peng Li <[email protected]>
Signed-off-by: Guangbin Huang <[email protected]>
---
drivers/net/wan/sealevel.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c
index b484d1f7b176..be618fd0b9a8 100644
--- a/drivers/net/wan/sealevel.c
+++ b/drivers/net/wan/sealevel.c
@@ -347,10 +347,10 @@ static void __exit slvl_shutdown(struct slvl_board *b)
kfree(b);
}
-static int io=0x238;
-static int txdma=1;
-static int rxdma=3;
-static int irq=5;
+static int io = 0x238;
+static int txdma = 1;
+static int rxdma = 3;
+static int irq = 5;
static bool slow=false;
module_param_hw(io, int, ioport, 0);
--
2.8.1
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
On Sun, 30 May 2021 14:24:24 +0800 you wrote:
> This patchset clean up some code style issues.
>
> Peng Li (10):
> net: sealevel: remove redundant blank lines
> net: sealevel: add blank line after declarations
> net: sealevel: fix the code style issue about "foo* bar"
> net: sealevel: open brace '{' following struct go on the same line
> net: sealevel: add some required spaces
> net: sealevel: remove redundant initialization for statics
> net: sealevel: fix a code style issue about switch and case
> net: sealevel: remove meaningless comments
> net: sealevel: fix the comments style issue
> net: sealevel: fix the alignment issue
>
> [...]
Here is the summary with links:
- [net-next,01/10] net: sealevel: remove redundant blank lines
https://git.kernel.org/netdev/net-next/c/801f0a1cf96f
- [net-next,02/10] net: sealevel: add blank line after declarations
https://git.kernel.org/netdev/net-next/c/58f30eea85a3
- [net-next,03/10] net: sealevel: fix the code style issue about "foo* bar"
https://git.kernel.org/netdev/net-next/c/8be88e3ccee4
- [net-next,04/10] net: sealevel: open brace '{' following struct go on the same line
https://git.kernel.org/netdev/net-next/c/f090d1c38107
- [net-next,05/10] net: sealevel: add some required spaces
https://git.kernel.org/netdev/net-next/c/52499d202dc6
- [net-next,06/10] net: sealevel: remove redundant initialization for statics
https://git.kernel.org/netdev/net-next/c/40e8ee9d467d
- [net-next,07/10] net: sealevel: fix a code style issue about switch and case
https://git.kernel.org/netdev/net-next/c/cc51e3f36e62
- [net-next,08/10] net: sealevel: remove meaningless comments
https://git.kernel.org/netdev/net-next/c/04d7ad8cca9c
- [net-next,09/10] net: sealevel: fix the comments style issue
https://git.kernel.org/netdev/net-next/c/b086ebfce34f
- [net-next,10/10] net: sealevel: fix the alignment issue
https://git.kernel.org/netdev/net-next/c/e24b60851936
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html