2020-02-29 17:47:38

by Lucas Tanure

Subject: [PATCH 1/2] HID: appleir: Remove unnecessary goto label

Signed-off-by: Lucas Tanure <[email protected]>
---
drivers/hid/hid-appleir.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/hid/hid-appleir.c b/drivers/hid/hid-appleir.c
index bf8d4afe0d6a..aafc285b538f 100644
--- a/drivers/hid/hid-appleir.c
+++ b/drivers/hid/hid-appleir.c
@@ -284,10 +284,8 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
struct appleir *appleir;

appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
- if (!appleir) {
- ret = -ENOMEM;
- goto allocfail;
- }
+ if (!appleir)
+ return -ENOMEM;

appleir->hid = hid;

@@ -314,7 +312,6 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
return 0;
fail:
kfree(appleir);
-allocfail:
return ret;
}

--
2.25.1

2020-03-13 16:33:19

by Jiri Kosina

Subject: Re: [PATCH 1/2] HID: appleir: Remove unnecessary goto label

On Sat, 29 Feb 2020, Lucas Tanure wrote:

> Signed-off-by: Lucas Tanure <[email protected]>
> ---
> drivers/hid/hid-appleir.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/hid/hid-appleir.c b/drivers/hid/hid-appleir.c
> index bf8d4afe0d6a..aafc285b538f 100644
> --- a/drivers/hid/hid-appleir.c
> +++ b/drivers/hid/hid-appleir.c
> @@ -284,10 +284,8 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
> struct appleir *appleir;
>
> appleir = kzalloc(sizeof(struct appleir), GFP_KERNEL);
> - if (!appleir) {
> - ret = -ENOMEM;
> - goto allocfail;
> - }
> + if (!appleir)
> + return -ENOMEM;
>
> appleir->hid = hid;
>
> @@ -314,7 +312,6 @@ static int appleir_probe(struct hid_device *hid, const struct hid_device_id *id)
> return 0;
> fail:
> kfree(appleir);
> -allocfail:
> return ret;
> }

Applied, thanks.

--
Jiri Kosina
SUSE Labs