[PATCH] Staging: slicoss: Fix checkpatch.pl issues

[PATCH] Staging: slicoss: Fix checkpatch.pl issues

[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.

Signed-off-by: Niranjan Dighe <niranjan.dighe@gmail.com>

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 3104cb0..f3110f7 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -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);
 	}
 
-- 
1.9.1

Re: [PATCH] Staging: slicoss: Fix checkpatch.pl issues

[Greg KH]

On Wed, Mar 25, 2015 at 01:28:43AM +0530, Niranjan Dighe wrote:
> 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

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

[Niranjan Dighe]

Removing code guarded by undefined macro SLIC_TRACE_DUMP_ENABLED

Signed-off-by: Niranjan Dighe <niranjan.dighe@gmail.com>

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 3104cb0..c2bda1d 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -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;
-- 
1.9.1

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

[Niranjan Dighe]

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

Signed-off-by: Niranjan Dighe <niranjan.dighe@gmail.com>

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index c2bda1d..f3110f7 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -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);
 	}
 
-- 
1.9.1

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

[Dan Carpenter]

On Thu, Mar 26, 2015 at 11:52:43PM +0530, Niranjan Dighe wrote:
> Replace string directly in place of format string and remove pointer
> variable which was used just once.
> 
> Signed-off-by: Niranjan Dighe <niranjan.dighe@gmail.com>
> 
> diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
> index c2bda1d..f3110f7 100644
> --- a/drivers/staging/slicoss/slicoss.c
> +++ b/drivers/staging/slicoss/slicoss.c
> @@ -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");

This indenting looks ugly.

regards,
dan carpenter

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

[Greg KH]

On Thu, Mar 26, 2015 at 11:52:43PM +0530, Niranjan Dighe wrote:
> Replace string directly in place of format string and remove pointer
> variable which was used just once.
> 
> Signed-off-by: Niranjan Dighe <niranjan.dighe@gmail.com>
> 
> diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
> index c2bda1d..f3110f7 100644
> --- a/drivers/staging/slicoss/slicoss.c
> +++ b/drivers/staging/slicoss/slicoss.c
> @@ -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");

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

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

[Joe Perches]

On Thu, 2015-03-26 at 19:52 +0100, Greg KH wrote:
> On Thu, Mar 26, 2015 at 11:52:43PM +0530, Niranjan Dighe wrote:
> > Replace string directly in place of format string and remove pointer
> > variable which was used just once.
[]
> > diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
[]
> > @@ -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...

You could also use dev_info_once instead.

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

[Greg KH]

On Thu, Mar 26, 2015 at 01:52:33PM -0700, Joe Perches wrote:
> On Thu, 2015-03-26 at 19:52 +0100, Greg KH wrote:
> > On Thu, Mar 26, 2015 at 11:52:43PM +0530, Niranjan Dighe wrote:
> > > Replace string directly in place of format string and remove pointer
> > > variable which was used just once.
> []
> > > diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
> []
> > > @@ -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...
> 
> 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

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

[Joe Perches]

On Thu, 2015-03-26 at 22:32 +0100, Greg KH wrote:
> On Thu, Mar 26, 2015 at 01:52:33PM -0700, Joe Perches wrote:
> > On Thu, 2015-03-26 at 19:52 +0100, Greg KH wrote:
> > > On Thu, Mar 26, 2015 at 11:52:43PM +0530, Niranjan Dighe wrote:
> > > > Replace string directly in place of format string and remove pointer
> > > > variable which was used just once.
> > []
> > > > diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
> > []
> > > > @@ -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...
> > 
> > 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.

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);