suggested by checkpatch
Signed-off-by: Forrest Fleming <[email protected]>
---
.../net/ethernet/intel/e1000/e1000_param.c | 28 +++++++++----------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000/e1000_param.c b/drivers/net/ethernet/intel/e1000/e1000_param.c
index d3f29ffe1e47..1a1f2f0237f9 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_param.c
+++ b/drivers/net/ethernet/intel/e1000/e1000_param.c
@@ -266,7 +266,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.arg = { .r = {
.min = E1000_MIN_TXD,
.max = mac_type < e1000_82544 ? E1000_MAX_TXD : E1000_MAX_82544_TXD
- }}
+ } }
};
if (num_TxDescriptors > bd) {
@@ -295,7 +295,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.min = E1000_MIN_RXD,
.max = mac_type < e1000_82544 ? E1000_MAX_RXD :
E1000_MAX_82544_RXD
- }}
+ } }
};
if (num_RxDescriptors > bd) {
@@ -341,7 +341,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.err = "reading default settings from EEPROM",
.def = E1000_FC_DEFAULT,
.arg = { .l = { .nr = ARRAY_SIZE(fc_list),
- .p = fc_list }}
+ .p = fc_list } }
};
if (num_FlowControl > bd) {
@@ -359,7 +359,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.err = "using default of " __MODULE_STRING(DEFAULT_TIDV),
.def = DEFAULT_TIDV,
.arg = { .r = { .min = MIN_TXDELAY,
- .max = MAX_TXDELAY }}
+ .max = MAX_TXDELAY } }
};
if (num_TxIntDelay > bd) {
@@ -377,7 +377,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.err = "using default of " __MODULE_STRING(DEFAULT_TADV),
.def = DEFAULT_TADV,
.arg = { .r = { .min = MIN_TXABSDELAY,
- .max = MAX_TXABSDELAY }}
+ .max = MAX_TXABSDELAY } }
};
if (num_TxAbsIntDelay > bd) {
@@ -395,7 +395,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.err = "using default of " __MODULE_STRING(DEFAULT_RDTR),
.def = DEFAULT_RDTR,
.arg = { .r = { .min = MIN_RXDELAY,
- .max = MAX_RXDELAY }}
+ .max = MAX_RXDELAY } }
};
if (num_RxIntDelay > bd) {
@@ -413,7 +413,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.err = "using default of " __MODULE_STRING(DEFAULT_RADV),
.def = DEFAULT_RADV,
.arg = { .r = { .min = MIN_RXABSDELAY,
- .max = MAX_RXABSDELAY }}
+ .max = MAX_RXABSDELAY } }
};
if (num_RxAbsIntDelay > bd) {
@@ -431,7 +431,7 @@ void e1000_check_options(struct e1000_adapter *adapter)
.err = "using default of " __MODULE_STRING(DEFAULT_ITR),
.def = DEFAULT_ITR,
.arg = { .r = { .min = MIN_ITR,
- .max = MAX_ITR }}
+ .max = MAX_ITR } }
};
if (num_InterruptThrottleRate > bd) {
@@ -545,7 +545,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter)
{ 0, "" },
{ SPEED_10, "" },
{ SPEED_100, "" },
- { SPEED_1000, "" }};
+ { SPEED_1000, "" } };
opt = (struct e1000_option) {
.type = list_option,
@@ -553,7 +553,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter)
.err = "parameter ignored",
.def = 0,
.arg = { .l = { .nr = ARRAY_SIZE(speed_list),
- .p = speed_list }}
+ .p = speed_list } }
};
if (num_Speed > bd) {
@@ -567,7 +567,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter)
static const struct e1000_opt_list dplx_list[] = {
{ 0, "" },
{ HALF_DUPLEX, "" },
- { FULL_DUPLEX, "" }};
+ { FULL_DUPLEX, "" } };
opt = (struct e1000_option) {
.type = list_option,
@@ -575,7 +575,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter)
.err = "parameter ignored",
.def = 0,
.arg = { .l = { .nr = ARRAY_SIZE(dplx_list),
- .p = dplx_list }}
+ .p = dplx_list } }
};
if (num_Duplex > bd) {
@@ -623,7 +623,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter)
{ 0x2c, AA "1000/FD, 100/FD, 100/HD" },
{ 0x2d, AA "1000/FD, 100/FD, 100/HD, 10/HD" },
{ 0x2e, AA "1000/FD, 100/FD, 100/HD, 10/FD" },
- { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" }};
+ { 0x2f, AA "1000/FD, 100/FD, 100/HD, 10/FD, 10/HD" } };
opt = (struct e1000_option) {
.type = list_option,
@@ -631,7 +631,7 @@ static void e1000_check_copper_options(struct e1000_adapter *adapter)
.err = "parameter ignored",
.def = AUTONEG_ADV_DEFAULT,
.arg = { .l = { .nr = ARRAY_SIZE(an_list),
- .p = an_list }}
+ .p = an_list } }
};
if (num_AutoNeg > bd) {
--
2.17.1
On Fri, 2019-08-23 at 19:14 +0000, Forrest Fleming wrote:
> suggested by checkpatch
>
> Signed-off-by: Forrest Fleming <[email protected]>
> ---
> .../net/ethernet/intel/e1000/e1000_param.c | 28 +++++++++----------
> 1 file changed, 14 insertions(+), 14 deletions(-)
While I do not see an issue with this change, I wonder how important it is
to make such a change. Especially since most of the hardware supported by
this driver is not available for testing. In addition, this is one
suggested change by checkpatch.pl that I personally do not agree with.
This is not a hard NAK, but you have to explain how this change makes the
code more readable before I consider it.
On Mon, 2019-08-26 at 01:03 -0700, Jeff Kirsher wrote:
> On Fri, 2019-08-23 at 19:14 +0000, Forrest Fleming wrote:
> > suggested by checkpatch
> >
> > Signed-off-by: Forrest Fleming <[email protected]>
> > ---
> > .../net/ethernet/intel/e1000/e1000_param.c | 28 +++++++++----------
> > 1 file changed, 14 insertions(+), 14 deletions(-)
>
> While I do not see an issue with this change, I wonder how important it is
> to make such a change. Especially since most of the hardware supported by
> this driver is not available for testing. In addition, this is one
> suggested change by checkpatch.pl that I personally do not agree with.
I think checkpatch should allow consecutive }}.
Maybe:
---
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 287fe73688f0..ac5e0f06e1af 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4687,7 +4687,7 @@ sub process {
# closing brace should have a space following it when it has anything
# on the line
- if ($line =~ /}(?!(?:,|;|\)))\S/) {
+ if ($line =~ /}(?!(?:,|;|\)|\}))\S/) {
if (ERROR("SPACING",
"space required after that close brace '}'\n" . $herecurr) &&
$fix) {
On Mon, 2019-08-26 at 20:41 -0700, Joe Perches wrote:
> On Mon, 2019-08-26 at 01:03 -0700, Jeff Kirsher wrote:
> > On Fri, 2019-08-23 at 19:14 +0000, Forrest Fleming wrote:
> > > suggested by checkpatch
> > >
> > > Signed-off-by: Forrest Fleming <[email protected]>
> > > ---
> > > .../net/ethernet/intel/e1000/e1000_param.c | 28 +++++++++--
> > > --------
> > > 1 file changed, 14 insertions(+), 14 deletions(-)
> >
> > While I do not see an issue with this change, I wonder how
> > important it is
> > to make such a change. Especially since most of the hardware
> > supported by
> > this driver is not available for testing. In addition, this is one
> > suggested change by checkpatch.pl that I personally do not agree
> > with.
>
> I think checkpatch should allow consecutive }}.
Agreed, have you already submitted a formal patch Joe with the
suggested change below? If so, I will ACK it.
>
> Maybe:
> ---
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 287fe73688f0..ac5e0f06e1af 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -4687,7 +4687,7 @@ sub process {
>
> # closing brace should have a space following it when it has
> anything
> # on the line
> - if ($line =~ /}(?!(?:,|;|\)))\S/) {
> + if ($line =~ /}(?!(?:,|;|\)|\}))\S/) {
> if (ERROR("SPACING",
> "space required after that close
> brace '}'\n" . $herecurr) &&
> $fix) {
>
>
On Tue, 2019-08-27 at 12:02 -0700, Jeff Kirsher wrote:
> On Mon, 2019-08-26 at 20:41 -0700, Joe Perches wrote:
> > On Mon, 2019-08-26 at 01:03 -0700, Jeff Kirsher wrote:
> > > On Fri, 2019-08-23 at 19:14 +0000, Forrest Fleming wrote:
> > > > suggested by checkpatch
> > > >
> > > > Signed-off-by: Forrest Fleming <[email protected]>
> > > > ---
> > > > .../net/ethernet/intel/e1000/e1000_param.c | 28 +++++++++--
> > > > --------
> > > > 1 file changed, 14 insertions(+), 14 deletions(-)
> > >
> > > While I do not see an issue with this change, I wonder how
> > > important it is
> > > to make such a change. Especially since most of the hardware
> > > supported by
> > > this driver is not available for testing. In addition, this is one
> > > suggested change by checkpatch.pl that I personally do not agree
> > > with.
> >
> > I think checkpatch should allow consecutive }}.
>
> Agreed, have you already submitted a formal patch Joe with the
> suggested change below?
No.
> If so, I will ACK it.
Of course you can add an Acked-by:
> > Maybe:
> > ---
> > diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> > index 287fe73688f0..ac5e0f06e1af 100755
> > --- a/scripts/checkpatch.pl
> > +++ b/scripts/checkpatch.pl
> > @@ -4687,7 +4687,7 @@ sub process {
> >
> > # closing brace should have a space following it when it has
> > anything
> > # on the line
> > - if ($line =~ /}(?!(?:,|;|\)))\S/) {
> > + if ($line =~ /}(?!(?:,|;|\)|\}))\S/) {
> > if (ERROR("SPACING",
> > "space required after that close
> > brace '}'\n" . $herecurr) &&
> > $fix) {
> >
> >
On Tue, Aug 27, 2019 at 12:07 PM Joe Perches <[email protected]> wrote:
>
> On Tue, 2019-08-27 at 12:02 -0700, Jeff Kirsher wrote:
> > On Mon, 2019-08-26 at 20:41 -0700, Joe Perches wrote:
> > > On Mon, 2019-08-26 at 01:03 -0700, Jeff Kirsher wrote:
> > > > On Fri, 2019-08-23 at 19:14 +0000, Forrest Fleming wrote:
> > > > > suggested by checkpatch
> > > > >
> > > > > Signed-off-by: Forrest Fleming <[email protected]>
> > > > > ---
> > > > > .../net/ethernet/intel/e1000/e1000_param.c | 28 +++++++++--
> > > > > --------
> > > > > 1 file changed, 14 insertions(+), 14 deletions(-)
> > > >
> > > > While I do not see an issue with this change, I wonder how
> > > > important it is
> > > > to make such a change. Especially since most of the hardware
> > > > supported by
> > > > this driver is not available for testing. In addition, this is one
> > > > suggested change by checkpatch.pl that I personally do not agree
> > > > with.
> > >
> > > I think checkpatch should allow consecutive }}.
> >
> > Agreed, have you already submitted a formal patch Joe with the
> > suggested change below?
>
> No.
>
> > If so, I will ACK it.
>
> Of course you can add an Acked-by:
>
Totally fair - I don't have strong feelings regarding the particular rule. I do
feel strongly that we should avoid violating our rules as encoded by checkpatch,
but I'm perfectly happy for the change to take the form of modifying checkpatch
to allow a perfectly sensible (and readable) construct.
I'm happy to withdraw this patch from consideration; I couldn't find anything
about there being a formal procedure for so doing, so please let me know if
there's anything more I need to do (or point me to the relevant docs).
Thanks to everyone!
On Mon, 2019-08-26 at 20:41 -0700, Joe Perches wrote:
> On Mon, 2019-08-26 at 01:03 -0700, Jeff Kirsher wrote:
> > On Fri, 2019-08-23 at 19:14 +0000, Forrest Fleming wrote:
> > > suggested by checkpatch
> > >
> > > Signed-off-by: Forrest Fleming <[email protected]>
> > > ---
> > > .../net/ethernet/intel/e1000/e1000_param.c | 28 +++++++++--
> > > --------
> > > 1 file changed, 14 insertions(+), 14 deletions(-)
> >
> > While I do not see an issue with this change, I wonder how
> > important it is
> > to make such a change. Especially since most of the hardware
> > supported by
> > this driver is not available for testing. In addition, this is one
> > suggested change by checkpatch.pl that I personally do not agree
> > with.
>
> I think checkpatch should allow consecutive }}.
Acked-by: Jeff Kirsher <[email protected]>
>
> Maybe:
> ---
> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
> index 287fe73688f0..ac5e0f06e1af 100755
> --- a/scripts/checkpatch.pl
> +++ b/scripts/checkpatch.pl
> @@ -4687,7 +4687,7 @@ sub process {
>
> # closing brace should have a space following it when it has
> anything
> # on the line
> - if ($line =~ /}(?!(?:,|;|\)))\S/) {
> + if ($line =~ /}(?!(?:,|;|\)|\}))\S/) {
> if (ERROR("SPACING",
> "space required after that close
> brace '}'\n" . $herecurr) &&
> $fix) {
>
>
On Tue, 2019-08-27 at 12:45 -0700, Forrest Fleming wrote:
> On Tue, Aug 27, 2019 at 12:07 PM Joe Perches <[email protected]> wrote:
> > On Tue, 2019-08-27 at 12:02 -0700, Jeff Kirsher wrote:
> > > On Mon, 2019-08-26 at 20:41 -0700, Joe Perches wrote:
> > > > On Mon, 2019-08-26 at 01:03 -0700, Jeff Kirsher wrote:
> > > > > On Fri, 2019-08-23 at 19:14 +0000, Forrest Fleming wrote:
> > > > > > suggested by checkpatch
> > > > > >
> > > > > > Signed-off-by: Forrest Fleming <[email protected]>
> > > > > > ---
> > > > > > .../net/ethernet/intel/e1000/e1000_param.c | 28
> > > > > > +++++++++--
> > > > > > --------
> > > > > > 1 file changed, 14 insertions(+), 14 deletions(-)
> > > > >
> > > > > While I do not see an issue with this change, I wonder how
> > > > > important it is
> > > > > to make such a change. Especially since most of the hardware
> > > > > supported by
> > > > > this driver is not available for testing. In addition, this
> > > > > is one
> > > > > suggested change by checkpatch.pl that I personally do not
> > > > > agree
> > > > > with.
> > > >
> > > > I think checkpatch should allow consecutive }}.
> > >
> > > Agreed, have you already submitted a formal patch Joe with the
> > > suggested change below?
> >
> > No.
> >
> > > If so, I will ACK it.
> >
> > Of course you can add an Acked-by:
> >
>
> Totally fair - I don't have strong feelings regarding the particular
> rule. I do
> feel strongly that we should avoid violating our rules as encoded by
> checkpatch,
> but I'm perfectly happy for the change to take the form of modifying
> checkpatch
> to allow a perfectly sensible (and readable) construct.
>
> I'm happy to withdraw this patch from consideration; I couldn't find
> anything
> about there being a formal procedure for so doing, so please let me
> know if
> there's anything more I need to do (or point me to the relevant
> docs).
>
> Thanks to everyone!
Nothing for you to do, I will drop the patch.
checkpatch allows consecutive open braces, so it
should also allow consecutive close braces.
Signed-off-by: Joe Perches <[email protected]>
Acked-by: Jeff Kirsher <[email protected]>
---
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 287fe73688f0..ac5e0f06e1af 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -4687,7 +4687,7 @@ sub process {
# closing brace should have a space following it when it has anything
# on the line
- if ($line =~ /}(?!(?:,|;|\)))\S/) {
+ if ($line =~ /}(?!(?:,|;|\)|\}))\S/) {
if (ERROR("SPACING",
"space required after that close brace '}'\n" . $herecurr) &&
$fix) {