Staging: slicoss: Fix checkpatch.pl issues

PATCH In review Niranjan Dighe 4 participants 9 messages Mar 24, 2015 – Mar 26, 2015 Staging

Share & tools

Niranjan Dighe

author

2015-03-24 19:58 UTC #0 lore raw

PATCH 1/1 Staging: slicoss: Fix checkpatch.pl issues

Removed unused block of code guarded by #ifdef SLIC_TRACE_DUMP_ENABLED And removed redundant static char *slic_banner and replaced actual string in place of format string.

Signed-off-by Niranjan Dighe <[email protected]>

drivers/staging/slicoss/slicoss.c +2 ~~-37~~

index 3104cb0..f3110f7 100644
@@ -98,7 +98,6 @@
 #include "slic.h"
 
 static uint slic_first_init = 1;
-static char *slic_banner = "Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)";
 
 static char *slic_proc_version = "2.0.351  2006/07/14 12:26:00";

@@ -2553,41 +2552,6 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 		slic_intagg_set(adapter, intagg);
 		return 0;
 
-#ifdef SLIC_TRACE_DUMP_ENABLED
-	case SIOCSLICTRACEDUMP:
-		{
-			u32 value;
-
-			DBG_IOCTL("slic_ioctl  SIOCSLIC_TRACE_DUMP\n");
-
-			if (copy_from_user(data, rq->ifr_data, 28)) {
-				PRINT_ERROR
-				    ("slic: copy_from_user FAILED getting initial simba param\n");
-				return -EFAULT;
-			}
-
-			value = data[0];
-			if (tracemon_request == SLIC_DUMP_DONE) {
-				PRINT_ERROR
-				    ("ATK Diagnostic Trace Dump Requested\n");
-				tracemon_request = SLIC_DUMP_REQUESTED;
-				tracemon_request_type = value;
-				tracemon_timestamp = jiffies;
-			} else if ((tracemon_request == SLIC_DUMP_REQUESTED) ||
-				   (tracemon_request ==
-				    SLIC_DUMP_IN_PROGRESS)) {
-				PRINT_ERROR
-				    ("ATK Diagnostic Trace Dump Requested but already in progress... ignore\n");
-			} else {
-				PRINT_ERROR
-				    ("ATK Diagnostic Trace Dump Requested\n");
-				tracemon_request = SLIC_DUMP_REQUESTED;
-				tracemon_request_type = value;
-				tracemon_timestamp = jiffies;
-			}
-			return 0;
-		}
-#endif
 	case SIOCETHTOOL:
 		if (copy_from_user(&ecmd, rq->ifr_data, sizeof(ecmd)))
 			return -EFAULT;

@@ -3081,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
 		return err;
 
 	if (did_version++ == 0) {
-		dev_info(&pcidev->dev, "%s\n", slic_banner);
+		dev_info(&pcidev->dev,
+		"Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n");
 		dev_info(&pcidev->dev, "%s\n", slic_proc_version);
 	}

Signature · 1 line

1.9.1

Greg KH

maintainer

2015-03-26 12:12 UTC #1 lore raw

Quoted 3 lines · Niranjan Dighe

Removed unused block of code guarded by #ifdef SLIC_TRACE_DUMP_ENABLED And removed redundant static char *slic_banner and replaced actual string in place of format string.

That's multiple things you are doing all in the same patch, please break this up into multiple patches and resend.

thanks,

greg k-h

Niranjan Dighe

author

2015-03-26 18:22 UTC #2 lore raw

PATCH v2 1/2 Staging: slicoss: Remove redundant and disabled code block

Removing code guarded by undefined macro SLIC_TRACE_DUMP_ENABLED

Signed-off-by Niranjan Dighe <[email protected]>

drivers/staging/slicoss/slicoss.c +0 ~~-35~~

index 3104cb0..c2bda1d 100644
@@ -2553,41 +2553,6 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 		slic_intagg_set(adapter, intagg);
 		return 0;
 
-#ifdef SLIC_TRACE_DUMP_ENABLED
-	case SIOCSLICTRACEDUMP:
-		{
-			u32 value;
-
-			DBG_IOCTL("slic_ioctl  SIOCSLIC_TRACE_DUMP\n");
-
-			if (copy_from_user(data, rq->ifr_data, 28)) {
-				PRINT_ERROR
-				    ("slic: copy_from_user FAILED getting initial simba param\n");
-				return -EFAULT;
-			}
-
-			value = data[0];
-			if (tracemon_request == SLIC_DUMP_DONE) {
-				PRINT_ERROR
-				    ("ATK Diagnostic Trace Dump Requested\n");
-				tracemon_request = SLIC_DUMP_REQUESTED;
-				tracemon_request_type = value;
-				tracemon_timestamp = jiffies;
-			} else if ((tracemon_request == SLIC_DUMP_REQUESTED) ||
-				   (tracemon_request ==
-				    SLIC_DUMP_IN_PROGRESS)) {
-				PRINT_ERROR
-				    ("ATK Diagnostic Trace Dump Requested but already in progress... ignore\n");
-			} else {
-				PRINT_ERROR
-				    ("ATK Diagnostic Trace Dump Requested\n");
-				tracemon_request = SLIC_DUMP_REQUESTED;
-				tracemon_request_type = value;
-				tracemon_timestamp = jiffies;
-			}
-			return 0;
-		}
-#endif
 	case SIOCETHTOOL:
 		if (copy_from_user(&ecmd, rq->ifr_data, sizeof(ecmd)))
 			return -EFAULT;

Signature · 1 line

1.9.1

Niranjan Dighe

author

2015-03-26 18:23 UTC #3 lore raw

PATCH v2 2/2 Staging: slicoss: Get rid of redundant pointer variable

In reply to Greg KH

Replace string directly in place of format string and remove pointer variable which was used just once.

Signed-off-by Niranjan Dighe <[email protected]>

drivers/staging/slicoss/slicoss.c +2 -2

index c2bda1d..f3110f7 100644
@@ -98,7 +98,6 @@
 #include "slic.h"
 
 static uint slic_first_init = 1;
-static char *slic_banner = "Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)";
 
 static char *slic_proc_version = "2.0.351  2006/07/14 12:26:00";

@@ -3046,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
 		return err;
 
 	if (did_version++ == 0) {
-		dev_info(&pcidev->dev, "%s\n", slic_banner);
+		dev_info(&pcidev->dev,
+		"Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n");
 		dev_info(&pcidev->dev, "%s\n", slic_proc_version);
 	}

Signature · 1 line

1.9.1

Dan Carpenter

2015-03-26 18:36 UTC #4 lore raw

Re: [PATCH v2 2/2] Staging: slicoss: Get rid of redundant pointer variable

Quoted 18 lines · Niranjan Dighe

Replace string directly in place of format string and remove pointer variable which was used just once.
Signed-off-by Niranjan Dighe <[email protected]>
drivers/staging/slicoss/slicoss.c +0 -1
index c2bda1d..f3110f7 100644
@@ -98,7 +98,6 @@
 #include "slic.h"
 
 static uint slic_first_init = 1;
-static char *slic_banner = "Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)";
 
 static char *slic_proc_version = "2.0.351  2006/07/14 12:26:00";
 

drivers/staging/slicoss/slicoss.c static int slic_entry_probe(struct pci_dev *pcidev, · line 3049

Quoted 6 lines

drivers/staging/slicoss/slicoss.c +2 -1

@@ -3046,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
 		return err;
 
 	if (did_version++ == 0) {
-		dev_info(&pcidev->dev, "%s\n", slic_banner);
+		dev_info(&pcidev->dev,
+		"Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n");

This indenting looks ugly.

regards,
dan carpenter

Greg KH

maintainer

2015-03-26 18:52 UTC #5 lore raw

Re: [PATCH v2 2/2] Staging: slicoss: Get rid of redundant pointer variable

In reply to Niranjan Dighe

Quoted 18 lines · Niranjan Dighe

Replace string directly in place of format string and remove pointer variable which was used just once.
Signed-off-by Niranjan Dighe <[email protected]>
drivers/staging/slicoss/slicoss.c +0 -1
index c2bda1d..f3110f7 100644
@@ -98,7 +98,6 @@
 #include "slic.h"
 
 static uint slic_first_init = 1;
-static char *slic_banner = "Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)";
 
 static char *slic_proc_version = "2.0.351  2006/07/14 12:26:00";
 

drivers/staging/slicoss/slicoss.c static int slic_entry_probe(struct pci_dev *pcidev, · line 3049

Quoted 6 lines

drivers/staging/slicoss/slicoss.c +2 -1

@@ -3046,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
 		return err;
 
 	if (did_version++ == 0) {
-		dev_info(&pcidev->dev, "%s\n", slic_banner);
+		dev_info(&pcidev->dev,
+		"Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n");

Why make this change? What's wrong with the original code?

There is the issue that driver should be quiet, so really, you can just delete all of this nonsense, but that's a different issue here...

thanks,

greg k-h

Joe Perches

2015-03-26 20:52 UTC #6 lore raw

Re: [PATCH v2 2/2] Staging: slicoss: Get rid of redundant pointer variable

Quoted 3 lines · Greg KH

Quoted 2 lines · Niranjan Dighe
Replace string directly in place of format string and remove pointer variable which was used just once.

[]

Quoted 1 line

drivers/staging/slicoss/slicoss.c
Quoted 1 line
drivers/staging/slicoss/slicoss.c +0 -0

[]

Quoted 10 lines

drivers/staging/slicoss/slicoss.c static int slic_entry_probe(struct pci_dev *pcidev, · line 3049
Quoted 7 lines
drivers/staging/slicoss/slicoss.c +2 -1
@@ -3046,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
 		return err;
 
 	if (did_version++ == 0) {
-		dev_info(&pcidev->dev, "%s\n", slic_banner);
+		dev_info(&pcidev->dev,
+		"Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n");
Why make this change? What's wrong with the original code?

Quoted 2 lines

There is the issue that driver should be quiet, so really, you can just delete all of this nonsense, but that's a different issue here...

You could also use dev_info_once instead.

Greg KH

maintainer

2015-03-26 21:33 UTC #7 lore raw

Re: [PATCH v2 2/2] Staging: slicoss: Get rid of redundant pointer variable

Quoted 17 lines · Joe Perches

Quoted 3 lines · Greg KH
Quoted 2 lines · Niranjan Dighe
Replace string directly in place of format string and remove pointer variable which was used just once.
[]
Quoted 1 line
drivers/staging/slicoss/slicoss.c
Quoted 1 line
drivers/staging/slicoss/slicoss.c +0 -0
[]
Quoted 10 lines
drivers/staging/slicoss/slicoss.c static int slic_entry_probe(struct pci_dev *pcidev, · line 3049
Quoted 7 lines
drivers/staging/slicoss/slicoss.c +2 -1
@@ -3046,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
 		return err;
 
 	if (did_version++ == 0) {
-		dev_info(&pcidev->dev, "%s\n", slic_banner);
+		dev_info(&pcidev->dev,
+		"Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n");
Why make this change? What's wrong with the original code?

Quoted 4 lines

Quoted 2 lines
There is the issue that driver should be quiet, so really, you can just delete all of this nonsense, but that's a different issue here...
You could also use dev_info_once instead.

No, drivers shouldn't make any noise when loaded, or when bound to a device, that's just fluff that is not needed, and is why we made the default module load macros to help prevent that from happening. Looks like people really wanted to be chatty here and tried to do it in their probe function instead :(

Just delete it.

thanks,

greg k-h

Joe Perches

2015-03-26 21:42 UTC #8 lore raw

Re: [PATCH v2 2/2] Staging: slicoss: Get rid of redundant pointer variable

Quoted 23 lines · Greg KH

Quoted 17 lines · Joe Perches
Quoted 3 lines · Greg KH
Quoted 2 lines · Niranjan Dighe
Replace string directly in place of format string and remove pointer variable which was used just once.
[]
Quoted 1 line
drivers/staging/slicoss/slicoss.c
Quoted 1 line
drivers/staging/slicoss/slicoss.c +0 -0
[]
Quoted 10 lines
drivers/staging/slicoss/slicoss.c static int slic_entry_probe(struct pci_dev *pcidev, · line 3049
Quoted 7 lines
drivers/staging/slicoss/slicoss.c +2 -1
@@ -3046,7 +3045,8 @@ static int slic_entry_probe(struct pci_dev *pcidev,
 		return err;
 
 	if (did_version++ == 0) {
-		dev_info(&pcidev->dev, "%s\n", slic_banner);
+		dev_info(&pcidev->dev,
+		"Alacritech SLIC Technology(tm) Server and Storage Accelerator (Non-Accelerated)\n");
Why make this change? What's wrong with the original code?
Quoted 4 lines
Quoted 2 lines
There is the issue that driver should be quiet, so really, you can just delete all of this nonsense, but that's a different issue here...
You could also use dev_info_once instead.

Quoted 7 lines

No, drivers shouldn't make any noise when loaded, or when bound to a device, that's just fluff that is not needed, and is why we made the default module load macros to help prevent that from happening. Looks like people really wanted to be chatty here and tried to do it in their probe function instead :(
Just delete it.

There are many probe functions that emit messages
in the tree. Most of the _once functions.

Maybe someone can delete those too.

$ git grep -E "\b[a-z_]+_once\s*\(.*(version|banner)" drivers
drivers/block/sx8.c:    printk_once(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n");
drivers/infiniband/hw/cxgb3/iwch.c:     printk_once(KERN_INFO MOD "Chelsio T3 RDMA Driver - version %s\n",
drivers/infiniband/hw/mlx4/main.c:      pr_info_once("%s", mlx4_ib_version);
drivers/infiniband/hw/mlx5/main.c:      printk_once(KERN_INFO "%s", mlx5_version);
drivers/infiniband/hw/mthca/mthca_main.c:       printk_once(KERN_INFO "%s", mthca_version);
drivers/infiniband/hw/usnic/usnic_ib_main.c:    printk_once(KERN_INFO "%s", usnic_version);
drivers/net/ethernet/8390/mac8390.c:    printk_once(KERN_INFO pr_fmt("%s"), version);
drivers/net/ethernet/amd/au1000_eth.c:  pr_info_once("%s version %s %s\n", DRV_NAME, DRV_VERSION, DRV_AUTHOR);
drivers/net/ethernet/broadcom/b44.c:    pr_info_once("%s version %s\n", DRV_DESCRIPTION, DRV_MODULE_VERSION);
drivers/net/ethernet/broadcom/tg3.c:    printk_once(KERN_INFO "%s\n", version);
drivers/net/ethernet/chelsio/cxgb/cxgb2.c:      pr_info_once("%s - version %s\n", DRV_DESCRIPTION, DRV_VERSION);
drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c:        pr_info_once("%s - version %s\n", DRV_DESC, DRV_VERSION);
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c:        printk_once(KERN_INFO "%s - version %s\n", DRV_DESC, DRV_VERSION);
drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c:    pr_info_once("%s - version %s\n", DRV_DESC, DRV_VERSION);
drivers/net/ethernet/cirrus/cs89x0.c:   pr_info_once("%s\n", version);
drivers/net/ethernet/dec/tulip/tulip_core.c:            printk_once(KERN_INFO "%s", version);
drivers/net/ethernet/mellanox/mlx4/en_main.c:   printk_once(KERN_INFO "%s", mlx4_en_version);
drivers/net/ethernet/mellanox/mlx4/main.c:      printk_once(KERN_INFO "%s", mlx4_version);
drivers/net/ethernet/realtek/8139cp.c:  pr_info_once("%s", version);
drivers/net/ethernet/smsc/epic100.c:    pr_info_once("%s%s\n", version, version2);
drivers/net/ethernet/smsc/smc9194.c:    pr_info_once("%s\n", version);
drivers/net/ethernet/smsc/smc91x.c:     pr_info_once("%s\n", version);
drivers/net/ethernet/sun/sungem.c:      printk_once(KERN_INFO "%s", version);
drivers/net/ethernet/sun/sunvnet.c:     printk_once(KERN_INFO "%s", version);
drivers/net/ethernet/via/via-rhine.c:   pr_info_once("%s\n", version);
drivers/net/wan/sbni.c: pr_info_once("%s", version);
drivers/net/wan/wanxl.c:        pr_info_once("%s\n", version);