net: pci200syn: clean up some code style issues
Subsystems (3)
cover net: pci200syn: clean up some code style issues
This patchset clean up some code style issues.
Peng Li (6):
net: pci200syn: remove redundant blank lines
net: pci200syn: add blank line after declarations
net: pci200syn: replace comparison to NULL with "!card"
net: pci200syn: add some required spaces
net: pci200syn: add necessary () to macro argument
net: pci200syn: fix the comments style issue
drivers/net/wan/pci200syn.c | 51 +++++++++++++-------------------------------- 1 file changed, 15 insertions(+), 36 deletions(-)
Signature · 1 line
2.8.1
PATCH 1/6 net: pci200syn: remove redundant blank lines
This patch removes some redundant blank lines.
--- drivers/net/wan/pci200syn.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/net/wan/pci200syn.c +0 -20
@@ -58,8 +58,6 @@ typedef struct {u32 init_ctrl;/* 50h : EEPROM ctrl, Init Ctrl, etc */ }plx9052; - - typedef struct port_s { struct napi_struct napi; struct net_device *netdev;
@@ -76,8 +74,6 @@ typedef struct port_s {u8 chan;/* physical port # - 0 or 1 */ }port_t; - - typedef struct card_s { u8 __iomem *rambase; /* buffer memory base (virtual) */ u8 __iomem *scabase; /* SCA memory base (virtual) */
@@ -90,7 +86,6 @@ typedef struct card_s {port_t ports[2 ]; }card_t; -#define get_port (card, port) (&card->ports[port])#define sca_flush (card) (sca_in(IER0, card))
@@ -112,7 +107,6 @@ static inline void new_memcpy_toio(char __iomem *dest, char *src, int length)#include "hd64572.c" -static void pci200_set_iface (port_t *port) {card_t *card = port->card;
@@ -151,8 +145,6 @@ static void pci200_set_iface(port_t *port)sca_set_port (port); } - -static int pci200_open (struct net_device *dev) {port_t *port =dev_to_port (dev);
@@ -167,8 +159,6 @@ static int pci200_open(struct net_device *dev)return 0 ; } - -static int pci200_close (struct net_device *dev) {sca_close (dev);
@@ -177,8 +167,6 @@ static int pci200_close(struct net_device *dev)return 0 ; } - -static int pci200_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {const size_t size =sizeof (sync_serial_settings);
@@ -233,8 +221,6 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) } } - -static void pci200_pci_remove_one (struct pci_dev *pdev) {int i;
@@ -407,15 +393,12 @@ static int pci200_pci_init_one(struct pci_dev *pdev,return 0 ; } - -static const struct pci_device_id pci200_pci_tbl[] = { {PCI_VENDOR_ID_PLX ,PCI_DEVICE_ID_PLX_9050 ,PCI_VENDOR_ID_PLX ,PCI_DEVICE_ID_PLX_PCI200SYN ,0 ,0 ,0 }, {0 , } }; -static struct pci_driver pci200_pci_driver = { .name ="PCI200SYN" , .id_table = pci200_pci_tbl,
@@ -423,7 +406,6 @@ static struct pci_driver pci200_pci_driver = { .remove = pci200_pci_remove_one, }; -static int __init pci200_init_module (void ) {if (pci_clock_freq <1000000 || pci_clock_freq >80000000 ) {
@@ -433,8 +415,6 @@ static int __init pci200_init_module(void)return pci_register_driver (&pci200_pci_driver); } - - static void __exit pci200_cleanup_module(void) {pci_unregister_driver (&pci200_pci_driver);
Signature · 1 line
2.8.1
PATCH 2/6 net: pci200syn: add blank line after declarations
In reply to Peng LiThis patch fixes the checkpatch error about missing a blank line after declarations.
--- drivers/net/wan/pci200syn.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/wan/pci200syn.c +3 -1
@@ -92,6 +92,7 @@ typedef struct card_s {static inline void new_memcpy_toio (char __iomem *dest,char *src,int length) {int len; + do { len = length > 256 ? 256 : length; memcpy_toio(dest, src, len);
@@ -148,8 +149,8 @@ static void pci200_set_iface(port_t *port)static int pci200_open (struct net_device *dev) {port_t *port =dev_to_port (dev); -int result =hdlc_open (dev); +if (result)return result;
@@ -366,6 +367,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev,port_t *port = &card->ports[i];struct net_device *dev = port->netdev;hdlc_device *hdlc =dev_to_hdlc (dev); + port->chan = i;spin_lock_init (&port->lock);
Signature · 1 line
2.8.1
PATCH 3/6 net: pci200syn: replace comparison to NULL with "!card"
In reply to Peng LiAccording to the chackpatch.pl, comparison to NULL could be written "!card".
--- drivers/net/wan/pci200syn.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/net/wan/pci200syn.c +2 -4
@@ -279,7 +279,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev, } card =kzalloc (sizeof (card_t),GFP_KERNEL ); -if (card ==NULL ) { +if (!card) {pci_release_regions (pdev);pci_disable_device (pdev);return -ENOBUFS ;
@@ -310,9 +310,7 @@ static int pci200_pci_init_one(struct pci_dev *pdev, ramphys =pci_resource_start (pdev,3 ) &PCI_BASE_ADDRESS_MEM_MASK ; card->rambase =pci_ioremap_bar (pdev,3 ); -if (card->plxbase ==NULL || - card->scabase ==NULL || - card->rambase ==NULL ) { +if (!card->plxbase || !card->scabase || !card->rambase) {pr_err ("ioremap() failed\n" );pci200_pci_remove_one (pdev);return -EFAULT ;
Signature · 1 line
2.8.1
PATCH 4/6 net: pci200syn: add some required spaces
In reply to Peng LiAdd spaces required after that close brace '}'. Add spaces required before the open parenthesis '('. Add spaces required after that ','.
--- drivers/net/wan/pci200syn.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/wan/pci200syn.c +8 -8
@@ -56,7 +56,7 @@ typedef struct {u32 cs_base[4 ];/* 3C-48h : Chip Select Base Addrs */ u32 intr_ctrl_stat;/* 4Ch : Interrupt Control/Status */ u32 init_ctrl;/* 50h : EEPROM ctrl, Init Ctrl, etc */ -}plx9052; +} plx9052; typedef struct port_s { struct napi_struct napi;
@@ -72,7 +72,7 @@ typedef struct port_s {u16 txlast;u8 rxs, txs, tmc;/* SCA registers */ u8 chan;/* physical port # - 0 or 1 */ -}port_t; +} port_t; typedef struct card_s { u8 __iomem *rambase; /* buffer memory base (virtual) */
@@ -84,7 +84,7 @@ typedef struct card_s {u8 irq;/* interrupt request level */ port_t ports[2 ]; -}card_t; +} card_t;#define get_port (card, port) (&card->ports[port])#define sca_flush (card) (sca_in(IER0, card))
@@ -117,7 +117,7 @@ static void pci200_set_iface(port_t *port)sca_out (EXS_TES1 , (port->chan ?MSCI1_OFFSET :MSCI0_OFFSET ) +EXS , port->card); -switch (port->settings.clock_type) { +switch (port->settings.clock_type) {case CLOCK_INT : rxs |=CLK_BRG ;/* BRG output */ txs |=CLK_PIN_OUT |CLK_TX_RXCLK ;/* RX clock */
@@ -184,7 +184,7 @@ static int pci200_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)if (cmd !=SIOCWANDEV )return hdlc_ioctl (dev, ifr, cmd); -switch (ifr->ifr_settings.type) { +switch (ifr->ifr_settings.type) {case IF_GET_IFACE : ifr->ifr_settings.type =IF_IFACE_V35 ;if (ifr->ifr_settings.size < size) {
@@ -301,13 +301,13 @@ static int pci200_pci_init_one(struct pci_dev *pdev,return -EFAULT ; } - plxphys =pci_resource_start (pdev,0 ) &PCI_BASE_ADDRESS_MEM_MASK ; + plxphys =pci_resource_start (pdev,0 ) &PCI_BASE_ADDRESS_MEM_MASK ; card->plxbase =ioremap (plxphys,PCI200SYN_PLX_SIZE ); - scaphys =pci_resource_start (pdev,2 ) &PCI_BASE_ADDRESS_MEM_MASK ; + scaphys =pci_resource_start (pdev,2 ) &PCI_BASE_ADDRESS_MEM_MASK ; card->scabase =ioremap (scaphys,PCI200SYN_SCA_SIZE ); - ramphys =pci_resource_start (pdev,3 ) &PCI_BASE_ADDRESS_MEM_MASK ; + ramphys =pci_resource_start (pdev,3 ) &PCI_BASE_ADDRESS_MEM_MASK ; card->rambase =pci_ioremap_bar (pdev,3 );if (!card->plxbase || !card->scabase || !card->rambase) {
Signature · 1 line
2.8.1
PATCH 5/6 net: pci200syn: add necessary () to macro argument
In reply to Peng LiMacro argument 'card' may be better as '(card)' to avoid precedence issues.
--- drivers/net/wan/pci200syn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wan/pci200syn.c +1 -1
@@ -86,7 +86,7 @@ typedef struct card_s {port_t ports[2 ]; } card_t; -#define get_port (card, port) (&card->ports[port]) +#define get_port (card, port) (&(card)->ports[port])#define sca_flush (card) (sca_in(IER0, card))static inline void new_memcpy_toio (char __iomem *dest,char *src,int length)
Signature · 1 line
2.8.1
PATCH 6/6 net: pci200syn: fix the comments style issue
In reply to Peng LiNetworking block comments don't use an empty /* line, use /* Comment...
This patch fixes the comments style issues.
--- drivers/net/wan/pci200syn.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wan/pci200syn.c +1 -2
@@ -42,8 +42,7 @@static int pci_clock_freq =33000000 ;#define CLOCK_BASE pci_clock_freq -/* -* PLX PCI9052 local configuration and shared runtime registers. +/* PLX PCI9052 local configuration and shared runtime registers. * This structure can be used to access 9052 registers (memory mapped). */ typedef struct {
Signature · 1 line
2.8.1
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 11 lines · On Tue, 15 Jun 2021 21:54:17 +0800 you wrote:
This patchset clean up some code style issues.
Peng Li (6):
net: pci200syn: remove redundant blank lines
net: pci200syn: add blank line after declarations
net: pci200syn: replace comparison to NULL with "!card"
net: pci200syn: add some required spaces
net: pci200syn: add necessary () to macro argument
net: pci200syn: fix the comments style issue[...]
Here is the summary with links:
- [net-next,1/6] net: pci200syn: remove redundant blank lines
https://git.kernel.org/netdev/net-next/c/bbcb2840b007 - [net-next,2/6] net: pci200syn: add blank line after declarations https://git.kernel.org/netdev/net-next/c/f9a03eae2850 - [net-next,3/6] net: pci200syn: replace comparison to NULL with "!card" https://git.kernel.org/netdev/net-next/c/b9282333efff - [net-next,4/6] net: pci200syn: add some required spaces https://git.kernel.org/netdev/net-next/c/2b637446685f - [net-next,5/6] net: pci200syn: add necessary () to macro argument https://git.kernel.org/netdev/net-next/c/8e7680c10284 - [net-next,6/6] net: pci200syn: fix the comments style issue https://git.kernel.org/netdev/net-next/c/6855d301e9d3
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html