* [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks
@ 2018-09-15 6:36 Nathan Chancellor
2018-09-17 17:29 ` Nick Desaulniers
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Nathan Chancellor @ 2018-09-15 6:36 UTC (permalink / raw)
To: Sathya Prakash, Chaitra P B, Suganath Prabu Subramani
Cc: MPT-FusionLinux.pdl, linux-scsi, linux-kernel, Nick Desaulniers,
Nathan Chancellor
Clang warns when multiple pairs of parentheses are used for a single
conditional statement.
drivers/message/fusion/mptbase.c:338:11: warning: equality comparison
with extraneous parentheses [-Wparentheses-equality]
if ((ioc == NULL))
~~~~^~~~~~~
drivers/message/fusion/mptbase.c:338:11: note: remove extraneous
parentheses around the comparison to silence this warning
if ((ioc == NULL))
~ ^ ~
drivers/message/fusion/mptbase.c:338:11: note: use '=' to turn this
equality comparison into an assignment
if ((ioc == NULL))
^~
=
drivers/message/fusion/mptbase.c:342:12: warning: equality comparison
with extraneous parentheses [-Wparentheses-equality]
if ((pdev == NULL))
~~~~~^~~~~~~
drivers/message/fusion/mptbase.c:342:12: note: remove extraneous
parentheses around the comparison to silence this warning
if ((pdev == NULL))
~ ^ ~
drivers/message/fusion/mptbase.c:342:12: note: use '=' to turn this
equality comparison into an assignment
if ((pdev == NULL))
^~
=
2 warnings generated.
Remove them and while we're at it, simplify the NULL checks as '!var' is
used more than 'var == NULL'.
Reported-by: Nick Desaulniers <ndesaulniers@google.com>
Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
---
drivers/message/fusion/mptbase.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
index dc1e43a02599..ba551d8dfba4 100644
--- a/drivers/message/fusion/mptbase.c
+++ b/drivers/message/fusion/mptbase.c
@@ -335,11 +335,11 @@ static int mpt_remove_dead_ioc_func(void *arg)
MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;
struct pci_dev *pdev;
- if ((ioc == NULL))
+ if (!ioc)
return -1;
pdev = ioc->pcidev;
- if ((pdev == NULL))
+ if (!pdev)
return -1;
pci_stop_and_remove_bus_device_locked(pdev);
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks
2018-09-15 6:36 [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks Nathan Chancellor
@ 2018-09-17 17:29 ` Nick Desaulniers
2018-09-28 6:31 ` Martin K. Petersen
2018-10-02 12:58 ` Arnd Bergmann
2 siblings, 0 replies; 6+ messages in thread
From: Nick Desaulniers @ 2018-09-17 17:29 UTC (permalink / raw)
To: Nathan Chancellor
Cc: sathya.prakash, chaitra.basappa, suganath-prabu.subramani,
MPT-FusionLinux.pdl, linux-scsi, LKML
On Fri, Sep 14, 2018 at 11:36 PM Nathan Chancellor
<natechancellor@gmail.com> wrote:
>
> Clang warns when multiple pairs of parentheses are used for a single
> conditional statement.
>
> drivers/message/fusion/mptbase.c:338:11: warning: equality comparison
> with extraneous parentheses [-Wparentheses-equality]
> if ((ioc == NULL))
> ~~~~^~~~~~~
> drivers/message/fusion/mptbase.c:338:11: note: remove extraneous
> parentheses around the comparison to silence this warning
> if ((ioc == NULL))
> ~ ^ ~
> drivers/message/fusion/mptbase.c:338:11: note: use '=' to turn this
> equality comparison into an assignment
> if ((ioc == NULL))
> ^~
> =
> drivers/message/fusion/mptbase.c:342:12: warning: equality comparison
> with extraneous parentheses [-Wparentheses-equality]
> if ((pdev == NULL))
> ~~~~~^~~~~~~
> drivers/message/fusion/mptbase.c:342:12: note: remove extraneous
> parentheses around the comparison to silence this warning
> if ((pdev == NULL))
> ~ ^ ~
> drivers/message/fusion/mptbase.c:342:12: note: use '=' to turn this
> equality comparison into an assignment
> if ((pdev == NULL))
> ^~
> =
> 2 warnings generated.
>
> Remove them and while we're at it, simplify the NULL checks as '!var' is
> used more than 'var == NULL'.
>
> Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
Nathan,
Thanks for this patch.
Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
> ---
> drivers/message/fusion/mptbase.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
> index dc1e43a02599..ba551d8dfba4 100644
> --- a/drivers/message/fusion/mptbase.c
> +++ b/drivers/message/fusion/mptbase.c
> @@ -335,11 +335,11 @@ static int mpt_remove_dead_ioc_func(void *arg)
> MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;
> struct pci_dev *pdev;
>
> - if ((ioc == NULL))
> + if (!ioc)
> return -1;
>
> pdev = ioc->pcidev;
> - if ((pdev == NULL))
> + if (!pdev)
> return -1;
>
> pci_stop_and_remove_bus_device_locked(pdev);
> --
> 2.18.0
>
--
Thanks,
~Nick Desaulniers
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks
2018-09-15 6:36 [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks Nathan Chancellor
2018-09-17 17:29 ` Nick Desaulniers
@ 2018-09-28 6:31 ` Martin K. Petersen
2018-10-02 12:58 ` Arnd Bergmann
2 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2018-09-28 6:31 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Sathya Prakash, Chaitra P B, Suganath Prabu Subramani,
MPT-FusionLinux.pdl, linux-scsi, linux-kernel, Nick Desaulniers
Nathan,
> Clang warns when multiple pairs of parentheses are used for a single
> conditional statement.
Applied to 4.20/scsi-queue. Thank you!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks
2018-09-15 6:36 [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks Nathan Chancellor
2018-09-17 17:29 ` Nick Desaulniers
2018-09-28 6:31 ` Martin K. Petersen
@ 2018-10-02 12:58 ` Arnd Bergmann
2018-10-02 15:07 ` Nathan Chancellor
2 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2018-10-02 12:58 UTC (permalink / raw)
To: natechancellor
Cc: Sathya Prakash, Chaitra P B, Suganath Prabu Subramani,
MPT-FusionLinux.pdl, linux-scsi, Linux Kernel Mailing List,
Nick Desaulniers
On Sat, Sep 15, 2018 at 8:38 AM Nathan Chancellor
<natechancellor@gmail.com> wrote:
> Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> ---
> drivers/message/fusion/mptbase.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
> index dc1e43a02599..ba551d8dfba4 100644
> --- a/drivers/message/fusion/mptbase.c
> +++ b/drivers/message/fusion/mptbase.c
> @@ -335,11 +335,11 @@ static int mpt_remove_dead_ioc_func(void *arg)
> MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;
> struct pci_dev *pdev;
>
> - if ((ioc == NULL))
> + if (!ioc)
> return -1;
>
> pdev = ioc->pcidev;
> - if ((pdev == NULL))
> + if (!pdev)
> return -1;
>
> pci_stop_and_remove_bus_device_locked(pdev);
> --
The exact same code also exists in drivers/scsi/mpt3sas/. I had a similar
patch for both drivers, but saw that yours now got merged for fusion.
If you don't mind, could you fix mpt3sas_base.c the same way?
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks
2018-10-02 12:58 ` Arnd Bergmann
@ 2018-10-02 15:07 ` Nathan Chancellor
2018-10-11 2:14 ` Martin K. Petersen
0 siblings, 1 reply; 6+ messages in thread
From: Nathan Chancellor @ 2018-10-02 15:07 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Sathya Prakash, Chaitra P B, Suganath Prabu Subramani,
MPT-FusionLinux.pdl, linux-scsi, Linux Kernel Mailing List,
Nick Desaulniers
On Tue, Oct 02, 2018 at 02:58:21PM +0200, Arnd Bergmann wrote:
> On Sat, Sep 15, 2018 at 8:38 AM Nathan Chancellor
> <natechancellor@gmail.com> wrote:
>
> > Reported-by: Nick Desaulniers <ndesaulniers@google.com>
> > Signed-off-by: Nathan Chancellor <natechancellor@gmail.com>
> > ---
> > drivers/message/fusion/mptbase.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c
> > index dc1e43a02599..ba551d8dfba4 100644
> > --- a/drivers/message/fusion/mptbase.c
> > +++ b/drivers/message/fusion/mptbase.c
> > @@ -335,11 +335,11 @@ static int mpt_remove_dead_ioc_func(void *arg)
> > MPT_ADAPTER *ioc = (MPT_ADAPTER *)arg;
> > struct pci_dev *pdev;
> >
> > - if ((ioc == NULL))
> > + if (!ioc)
> > return -1;
> >
> > pdev = ioc->pcidev;
> > - if ((pdev == NULL))
> > + if (!pdev)
> > return -1;
> >
> > pci_stop_and_remove_bus_device_locked(pdev);
> > --
>
>
> The exact same code also exists in drivers/scsi/mpt3sas/. I had a similar
> patch for both drivers, but saw that yours now got merged for fusion.
>
> If you don't mind, could you fix mpt3sas_base.c the same way?
>
> Arnd
Hi Arnd,
I did sent a patch for this a little bit later: https://lore.kernel.org/lkml/20180920201002.23979-1-natechancellor@gmail.com/
I am still waiting for it to be merged.
Thanks!
Nathan
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks
2018-10-02 15:07 ` Nathan Chancellor
@ 2018-10-11 2:14 ` Martin K. Petersen
0 siblings, 0 replies; 6+ messages in thread
From: Martin K. Petersen @ 2018-10-11 2:14 UTC (permalink / raw)
To: Nathan Chancellor
Cc: Arnd Bergmann, Sathya Prakash, Chaitra P B,
Suganath Prabu Subramani, MPT-FusionLinux.pdl, linux-scsi,
Linux Kernel Mailing List, Nick Desaulniers
Nathan,
>> The exact same code also exists in drivers/scsi/mpt3sas/. I had a similar
>> patch for both drivers, but saw that yours now got merged for fusion.
>>
>> If you don't mind, could you fix mpt3sas_base.c the same way?
>>
>> Arnd
>
> Hi Arnd,
>
> I did sent a patch for this a little bit later:
> https://lore.kernel.org/lkml/20180920201002.23979-1-natechancellor@gmail.com/
>
> I am still waiting for it to be merged.
I generally don't merge patches for drivers that are actively maintained
unless the driver maintainer explicitly acks the change. However, this
was trivial enough. Applied to 4.20/scsi-queue.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-11 2:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-15 6:36 [PATCH] scsi: mptfusion: Remove unnecessary parentheses and simplify null checks Nathan Chancellor
2018-09-17 17:29 ` Nick Desaulniers
2018-09-28 6:31 ` Martin K. Petersen
2018-10-02 12:58 ` Arnd Bergmann
2018-10-02 15:07 ` Nathan Chancellor
2018-10-11 2:14 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).