* Staging: slicoss: Fix checkpatch.pl issues
@ 2015-03-24 19:09 Niranjan Dighe
2015-03-24 19:26 ` Joe Perches
2015-03-24 20:14 ` Dan Carpenter
0 siblings, 2 replies; 4+ messages in thread
From: Niranjan Dighe @ 2015-03-24 19:09 UTC (permalink / raw)
To: gregkh; +Cc: liodot, charrer, devel, linux-kernel, Niranjan Dighe
The following files had coding style issues that I tried to address.
It was mostly about lines spanning more than 80 characters.
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..2161bdb 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -98,7 +98,8 @@
#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_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";
@@ -755,10 +756,10 @@ static bool slic_mac_filter(struct adapter *adapter,
while (mcaddr) {
if (ether_addr_equal(mcaddr->address,
- ether_frame->ether_dhost)) {
- adapter->rcv_multicasts++;
- netdev->stats.multicast++;
- return true;
+ ether_frame->ether_dhost)) {
+ adapter->rcv_multicasts++;
+ netdev->stats.multicast++;
+ return true;
}
mcaddr = mcaddr->next;
}
@@ -2561,8 +2562,9 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
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");
+ PRINT_ERROR(
+ "slic: copy_from_user FAILED getting initial simba param\n"
+ );
return -EFAULT;
}
@@ -2576,8 +2578,9 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
} 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");
+ PRINT_ERROR(
+ "ATK Diagnostic Trace Dump Requested but already in progress... ignore\n"
+ );
} else {
PRINT_ERROR
("ATK Diagnostic Trace Dump Requested\n");
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: Staging: slicoss: Fix checkpatch.pl issues
2015-03-24 19:09 Staging: slicoss: Fix checkpatch.pl issues Niranjan Dighe
@ 2015-03-24 19:26 ` Joe Perches
2015-03-24 20:14 ` Dan Carpenter
1 sibling, 0 replies; 4+ messages in thread
From: Joe Perches @ 2015-03-24 19:26 UTC (permalink / raw)
To: Niranjan Dighe; +Cc: gregkh, liodot, charrer, devel, linux-kernel
On Wed, 2015-03-25 at 00:39 +0530, Niranjan Dighe wrote:
> The following files had coding style issues that I tried to address.
> It was mostly about lines spanning more than 80 characters.
[]
> diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
[]
> @@ -98,7 +98,8 @@
> #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_banner = "Alacritech SLIC Technology(tm) Server "
> + "and Storage Accelerator (Non-Accelerated)";
Please don't split strings.
Maybe remove this and update the format in the one place
it's used instead.
> @@ -755,10 +756,10 @@ static bool slic_mac_filter(struct adapter *adapter,
>
> while (mcaddr) {
> if (ether_addr_equal(mcaddr->address,
> - ether_frame->ether_dhost)) {
> - adapter->rcv_multicasts++;
> - netdev->stats.multicast++;
> - return true;
> + ether_frame->ether_dhost)) {
> + adapter->rcv_multicasts++;
> + netdev->stats.multicast++;
> + return true;
80 columns is a preferred limit not a hard one.
The original is correct and your new indentation is not.
> @@ -2561,8 +2562,9 @@ static int slic_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
> 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");
> + PRINT_ERROR(
> + "slic: copy_from_user FAILED getting initial simba param\n"
> + );
Just remove all the #ifdef SLIC_TRACE_DUMP_ENABLED blocks,
PRINT_ERROR isn't defined anywhere. and this can't be compiled.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Staging: slicoss: Fix checkpatch.pl issues
2015-03-24 19:09 Staging: slicoss: Fix checkpatch.pl issues Niranjan Dighe
2015-03-24 19:26 ` Joe Perches
@ 2015-03-24 20:14 ` Dan Carpenter
2015-03-24 20:27 ` Joe Perches
1 sibling, 1 reply; 4+ messages in thread
From: Dan Carpenter @ 2015-03-24 20:14 UTC (permalink / raw)
To: Niranjan Dighe; +Cc: gregkh, devel, charrer, liodot, linux-kernel
On Wed, Mar 25, 2015 at 12:39:06AM +0530, Niranjan Dighe wrote:
> The following files had coding style issues that I tried to address.
> It was mostly about lines spanning more than 80 characters.
>
> 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..2161bdb 100644
> --- a/drivers/staging/slicoss/slicoss.c
> +++ b/drivers/staging/slicoss/slicoss.c
> @@ -98,7 +98,8 @@
> #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_banner = "Alacritech SLIC Technology(tm) Server "
> + "and Storage Accelerator (Non-Accelerated)";
Just leave it. The original is better for grepping.
>
> static char *slic_proc_version = "2.0.351 2006/07/14 12:26:00";
>
> @@ -755,10 +756,10 @@ static bool slic_mac_filter(struct adapter *adapter,
>
> while (mcaddr) {
> if (ether_addr_equal(mcaddr->address,
> - ether_frame->ether_dhost)) {
> - adapter->rcv_multicasts++;
> - netdev->stats.multicast++;
> - return true;
> + ether_frame->ether_dhost)) {
> + adapter->rcv_multicasts++;
> + netdev->stats.multicast++;
> + return true;
> }
> mcaddr = mcaddr->next;
> }
Check patch likes the new code but the original is better for human
beings. Sorry.
regards,
dan carpenter
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Staging: slicoss: Fix checkpatch.pl issues
2015-03-24 20:14 ` Dan Carpenter
@ 2015-03-24 20:27 ` Joe Perches
0 siblings, 0 replies; 4+ messages in thread
From: Joe Perches @ 2015-03-24 20:27 UTC (permalink / raw)
To: Dan Carpenter
Cc: Niranjan Dighe, gregkh, devel, charrer, liodot, linux-kernel
On Tue, 2015-03-24 at 23:14 +0300, Dan Carpenter wrote:
> On Wed, Mar 25, 2015 at 12:39:06AM +0530, Niranjan Dighe wrote:
> > The following files had coding style issues that I tried to address.
> > It was mostly about lines spanning more than 80 characters.
[]
> > diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
[]
> > @@ -755,10 +756,10 @@ static bool slic_mac_filter(struct adapter *adapter,
> >
> > while (mcaddr) {
> > if (ether_addr_equal(mcaddr->address,
> > - ether_frame->ether_dhost)) {
> > - adapter->rcv_multicasts++;
> > - netdev->stats.multicast++;
> > - return true;
> > + ether_frame->ether_dhost)) {
> > + adapter->rcv_multicasts++;
> > + netdev->stats.multicast++;
> > + return true;
> > }
> > mcaddr = mcaddr->next;
> > }
>
> Check patch likes the new code but the original is better for human
> beings. Sorry.
The indentation isn't correct in the new code either.
That's actually a checkpatch defect because it's not
able to track deletion/insertion alignment well enough.
Niranjan, checkpatch is a brainless little tool.
Always use yours whenever using checkpatch.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-03-24 20:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-24 19:09 Staging: slicoss: Fix checkpatch.pl issues Niranjan Dighe
2015-03-24 19:26 ` Joe Perches
2015-03-24 20:14 ` Dan Carpenter
2015-03-24 20:27 ` Joe Perches
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.