diff mbox series

misc: hisi_hikey_usb: use PTR_ERR_OR_ZERO

Message ID 20201026180026.3350-1-sudipm.mukherjee@gmail.com (mailing list archive)
State New, archived
Headers show
Series misc: hisi_hikey_usb: use PTR_ERR_OR_ZERO | expand

Commit Message

Sudip Mukherjee Oct. 26, 2020, 6 p.m. UTC
Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
doing 'return 0'.

Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
---
 drivers/misc/hisi_hikey_usb.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Comments

Lukas Bulwahn Oct. 27, 2020, 5:36 a.m. UTC | #1
On Mon, 26 Oct 2020, Sudip Mukherjee wrote:

> Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
> we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
> doing 'return 0'.
> 
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> ---
>  drivers/misc/hisi_hikey_usb.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/misc/hisi_hikey_usb.c b/drivers/misc/hisi_hikey_usb.c
> index cc93569e601c..989d7d129469 100644
> --- a/drivers/misc/hisi_hikey_usb.c
> +++ b/drivers/misc/hisi_hikey_usb.c
> @@ -168,10 +168,7 @@ static int hisi_hikey_usb_parse_kirin970(struct platform_device *pdev,
>  
>  	hisi_hikey_usb->reset = devm_gpiod_get(&pdev->dev, "hub_reset_en_gpio",
>  					       GPIOD_OUT_HIGH);
> -	if (IS_ERR(hisi_hikey_usb->reset))
> -		return PTR_ERR(hisi_hikey_usb->reset);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(hisi_hikey_usb->reset);
>  }
>

(Just among us, not with the kernel maintainers...)

I think such patches should be also CCed to kernel-janitors.

For the next patch: could you include the specific coccinelle rule upon 
which you reacted?

I think in the very long-term future, it would be nice if we can somehow 
link a finding from a specific tool (with some kind of URI) in the commit 
message or so.

E.g., https://findings.kernel.org/coccinelle/somehash/ and then it shows 
the specific finding you looked at in a specific version and links to
the reported findings in other runs and versions.

(more realistically, it would probably end up in kcidb or so...)

That would be a nice tool to allow good traceability of the work at low 
additional effort.

Well just a random thought... What do you think?

Lukas

>  static int hisi_hikey_usb_probe(struct platform_device *pdev)
> -- 
> 2.11.0
> 
> 
> 
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#122): https://lists.elisa.tech/g/linux-safety/message/122
Mute This Topic: https://lists.elisa.tech/mt/77821561/4688437
Group Owner: linux-safety+owner@lists.elisa.tech
Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [patchwork-linux-safety@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Lukas Bulwahn Oct. 27, 2020, 6:59 a.m. UTC | #2
On Mon, 26 Oct 2020, Sudip Mukherjee wrote:

> Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
> we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
> doing 'return 0'.
> 
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

A nice small local clean up.

Here is my test report:

Build requires HISI_HIKEY_USB in config:

Symbol: HISI_HIKEY_USB [=n]
Type: tristate
Defined at drivers/misc/Kconfig:459
Prompt: USB GPIO Hub on HiSilicon Hikey 960/970 Platform
Depends on: (OF [=n] && GPIOLIB [=n] || COMPILE_TEST [=n]) && 
USB_ROLE_SWITCH [=n]

Build Preparation:

make defconfig
./scripts/config -e CONFIG_OF
./scripts/config -e CONFIG_GPIOLIB
./scripts/config -e CONFIG_USB_ROLE_SWITCH
./scripts/config -e CONFIG_HISI_HIKEY_USB
make olddefconfig

Build on next-20201027:

make
md5sum ./drivers/misc/hisi_hikey_usb.o
770db9ff0c1ca193eda2207a28deee4a  ./drivers/misc/hisi_hikey_usb.o
objdump -d ./drivers/misc/hisi_hikey_usb.o > hisi_hikey_usb.next-20201027.objdump

Build with patch on next-20201027:

make clean && make
md5sum ./drivers/misc/hisi_hikey_usb.o
770db9ff0c1ca193eda2207a28deee4a  ./drivers/misc/hisi_hikey_usb.o

objdump -d ./drivers/misc/hisi_hikey_usb.o > hisi_hikey_usb.cleanup-on-next-20201027.objdump

Compare objdump:

diff hisi_hikey_usb.next-20201027.objdump hisi_hikey_usb.cleanup-on-next-20201027.objdump

Summary:

'{md5sum,objdump -d} ./drivers/misc/hisi_hikey_usb.o' are identical before 
and after patch.

So, no functional change and no change in object code.

Tested-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>

> ---
>  drivers/misc/hisi_hikey_usb.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/misc/hisi_hikey_usb.c b/drivers/misc/hisi_hikey_usb.c
> index cc93569e601c..989d7d129469 100644
> --- a/drivers/misc/hisi_hikey_usb.c
> +++ b/drivers/misc/hisi_hikey_usb.c
> @@ -168,10 +168,7 @@ static int hisi_hikey_usb_parse_kirin970(struct platform_device *pdev,
>  
>  	hisi_hikey_usb->reset = devm_gpiod_get(&pdev->dev, "hub_reset_en_gpio",
>  					       GPIOD_OUT_HIGH);
> -	if (IS_ERR(hisi_hikey_usb->reset))
> -		return PTR_ERR(hisi_hikey_usb->reset);
> -
> -	return 0;
> +	return PTR_ERR_OR_ZERO(hisi_hikey_usb->reset);
>  }
>  
>  static int hisi_hikey_usb_probe(struct platform_device *pdev)
> -- 
> 2.11.0
> 
> 
> 
> 
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#123): https://lists.elisa.tech/g/linux-safety/message/123
Mute This Topic: https://lists.elisa.tech/mt/77821561/4688437
Group Owner: linux-safety+owner@lists.elisa.tech
Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [patchwork-linux-safety@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
Sudip Mukherjee Oct. 27, 2020, 10:08 a.m. UTC | #3
Hi Lukas,

On 27/10/2020 05:36, Lukas Bulwahn wrote:
> 
> 
> On Mon, 26 Oct 2020, Sudip Mukherjee wrote:
> 
>> Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
>> we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
>> doing 'return 0'.
>>
>> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
>> ---

<snip>

> 
> I think in the very long-term future, it would be nice if we can somehow 
> link a finding from a specific tool (with some kind of URI) in the commit 
> message or so.

I was thinking something almost similar, and was wondering if I can add
the tool name with some tags and then it will be possible to generate
some stats later about which tool fixed more things. I will send out a
mail later today to lkml proposing that we use such a tag.

I think adding URI is not possible until we have a persistent link to
these reports. The report that I generate can only have last 4 days
report, so the URI will not be valid after 4th day.
Lukas Bulwahn Oct. 27, 2020, 10:23 a.m. UTC | #4
On Tue, 27 Oct 2020, Sudip Mukherjee wrote:

> Hi Lukas,
> 
> On 27/10/2020 05:36, Lukas Bulwahn wrote:
> > 
> > 
> > On Mon, 26 Oct 2020, Sudip Mukherjee wrote:
> > 
> >> Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
> >> we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
> >> doing 'return 0'.
> >>
> >> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
> >> ---
> 
> <snip>
> 
> > 
> > I think in the very long-term future, it would be nice if we can somehow 
> > link a finding from a specific tool (with some kind of URI) in the commit 
> > message or so.
> 
> I was thinking something almost similar, and was wondering if I can add
> the tool name with some tags and then it will be possible to generate
> some stats later about which tool fixed more things. I will send out a
> mail later today to lkml proposing that we use such a tag.
>
> I think adding URI is not possible until we have a persistent link to
> these reports. The report that I generate can only have last 4 days
> report, so the URI will not be valid after 4th day.
>

I would prefer to first include the reports into kernel ci db and maybe 
then we understand much better how to make those persistent links.

Lukas


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#125): https://lists.elisa.tech/g/linux-safety/message/125
Mute This Topic: https://lists.elisa.tech/mt/77821561/4688437
Group Owner: linux-safety+owner@lists.elisa.tech
Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [patchwork-linux-safety@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
John Stultz Nov. 3, 2020, 6:11 a.m. UTC | #5
On Mon, Oct 26, 2020 at 11:02 AM Sudip Mukherjee
<sudipm.mukherjee@gmail.com> wrote:
>
> Coccinelle suggested using PTR_ERR_OR_ZERO() and looking at the code,
> we can use PTR_ERR_OR_ZERO() instead of checking IS_ERR() and then
> doing 'return 0'.
>
> Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>

Thanks for sending this!

Acked-by: John Stultz <john.stultz@linaro.org>

thanks
-john


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#150): https://lists.elisa.tech/g/linux-safety/message/150
Mute This Topic: https://lists.elisa.tech/mt/77821561/4688437
Group Owner: linux-safety+owner@lists.elisa.tech
Unsubscribe: https://lists.elisa.tech/g/linux-safety/unsub [patchwork-linux-safety@patchwork.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
diff mbox series

Patch

diff --git a/drivers/misc/hisi_hikey_usb.c b/drivers/misc/hisi_hikey_usb.c
index cc93569e601c..989d7d129469 100644
--- a/drivers/misc/hisi_hikey_usb.c
+++ b/drivers/misc/hisi_hikey_usb.c
@@ -168,10 +168,7 @@  static int hisi_hikey_usb_parse_kirin970(struct platform_device *pdev,
 
 	hisi_hikey_usb->reset = devm_gpiod_get(&pdev->dev, "hub_reset_en_gpio",
 					       GPIOD_OUT_HIGH);
-	if (IS_ERR(hisi_hikey_usb->reset))
-		return PTR_ERR(hisi_hikey_usb->reset);
-
-	return 0;
+	return PTR_ERR_OR_ZERO(hisi_hikey_usb->reset);
 }
 
 static int hisi_hikey_usb_probe(struct platform_device *pdev)