From 801f0a1cf96f314ed88b51a2ceb243952ab37e7c Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:25 +0800 Subject: [PATCH 01/10] net: sealevel: remove redundant blank lines This patch removes some redundant blank lines. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- drivers/net/wan/sealevel.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 7dddc9dcbe23b..62cc59892d1e5 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c @@ -29,14 +29,12 @@ #include #include "z85230.h" - struct slvl_device { struct z8530_channel *chan; int channel; }; - struct slvl_board { struct slvl_device dev[2]; @@ -195,7 +193,6 @@ static int slvl_setup(struct slvl_device *sv, int iobase, int irq) return 0; } - /* * Allocate and setup Sealevel board. */ @@ -256,7 +253,6 @@ static __init struct slvl_board *slvl_init(int iobase, int irq, 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 */ @@ -351,7 +347,6 @@ static void __exit slvl_shutdown(struct slvl_board *b) kfree(b); } - static int io=0x238; static int txdma=1; static int rxdma=3; From 58f30eea85a336d4931fa76099f24fa51797666d Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:26 +0800 Subject: [PATCH 02/10] net: sealevel: add blank line after declarations This patch fixes the checkpatch error about missing a blank line after declarations. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- drivers/net/wan/sealevel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 62cc59892d1e5..829e9bc01a499 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c @@ -174,6 +174,7 @@ static const struct net_device_ops sealevel_ops = { static int slvl_setup(struct slvl_device *sv, int iobase, int irq) { struct net_device *dev = alloc_hdlcdev(sv); + if (!dev) return -1; @@ -334,6 +335,7 @@ static void __exit slvl_shutdown(struct slvl_board *b) for (u = 0; u < 2; u++) { struct net_device *d = b->dev[u].chan->netdevice; + unregister_hdlc_device(d); free_netdev(d); } From 8be88e3ccee49716a45972c7451b8033737fc9f0 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:27 +0800 Subject: [PATCH 03/10] net: sealevel: fix the code style issue about "foo* bar" Fix the checkpatch error as "(foo*)" should be "(foo *)". Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- 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 829e9bc01a499..465c9ace1dc7b 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; } From f090d1c38107dd964e933f7be9885baee15325f6 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:28 +0800 Subject: [PATCH 04/10] net: sealevel: open brace '{' following struct go on the same line Fix the checkpatch error as open brace '{' following struct should go on the same line. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- drivers/net/wan/sealevel.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 465c9ace1dc7b..b484d1f7b1764 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c @@ -29,14 +29,12 @@ #include #include "z85230.h" -struct slvl_device -{ +struct slvl_device { struct z8530_channel *chan; int channel; }; -struct slvl_board -{ +struct slvl_board { struct slvl_device dev[2]; struct z8530_dev board; int iobase; From 52499d202dc6ecb995fb56e9933e503f6d484495 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:29 +0800 Subject: [PATCH 05/10] net: sealevel: add some required spaces Add spaces required around that '='. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- 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 b484d1f7b1764..be618fd0b9a84 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); From 40e8ee9d467dda815b10e9c2eb77ab7cf715ca1a Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:30 +0800 Subject: [PATCH 06/10] net: sealevel: remove redundant initialization for statics Should not initialise statics to false. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- 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 be618fd0b9a84..d19e9024865fe 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"); From cc51e3f36e6268697cf760dc770dc51154e13a51 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:31 +0800 Subject: [PATCH 07/10] net: sealevel: fix a code style issue about switch and case According to the chackpatch.pl, switch and case should be at the same indent. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- 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 d19e9024865fe..e07309e0d9713 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; } From 04d7ad8cca9c33df22b3f5ef964ca9cb86d8ee8e Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:32 +0800 Subject: [PATCH 08/10] net: sealevel: remove meaningless comments Remove the meaningless stylistically wrong comment. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- 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 e07309e0d9713..6665732f96ce2 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; } From b086ebfce34f78de02c1966d21931f681955778d Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:33 +0800 Subject: [PATCH 09/10] net: sealevel: fix the comments style issue 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 Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- 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 6665732f96ce2..60028cfaaab55 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); From e24b608519363712a00327b0dbb4f12861cb6b55 Mon Sep 17 00:00:00 2001 From: Peng Li Date: Sun, 30 May 2021 14:24:34 +0800 Subject: [PATCH 10/10] net: sealevel: fix the alignment issue Alignment should match open parenthesis. Signed-off-by: Peng Li Signed-off-by: Guangbin Huang Signed-off-by: Jakub Kicinski --- 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 60028cfaaab55..4403e219ca036 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); }