2020-11-10 03:20:10

by Jing Xiangfeng

Subject: [PATCH] HID: intel-ish-hid: Remove unnecessary assignment to variable rv

This assignment to rv is unused in an error path. So remove it.

Signed-off-by: Jing Xiangfeng <[email protected]>
---
drivers/hid/intel-ish-hid/ishtp-hid.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c
index b8aae69ad15d..393bed0abee9 100644
--- a/drivers/hid/intel-ish-hid/ishtp-hid.c
+++ b/drivers/hid/intel-ish-hid/ishtp-hid.c
@@ -211,10 +211,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
struct ishtp_hid_data *hid_data;

hid = hid_allocate_device();
- if (IS_ERR(hid)) {
- rv = PTR_ERR(hid);
- return -ENOMEM;
- }
+ if (IS_ERR(hid))
+ return PTR_ERR(hid);

hid_data = kzalloc(sizeof(*hid_data), GFP_KERNEL);
if (!hid_data) {
--
2.17.1

2020-11-25 13:00:03

by Jiri Kosina

Subject: Re: [PATCH] HID: intel-ish-hid: Remove unnecessary assignment to variable rv

On Tue, 10 Nov 2020, Jing Xiangfeng wrote:

> This assignment to rv is unused in an error path. So remove it.
>
> Signed-off-by: Jing Xiangfeng <[email protected]>
> ---
> drivers/hid/intel-ish-hid/ishtp-hid.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.c b/drivers/hid/intel-ish-hid/ishtp-hid.c
> index b8aae69ad15d..393bed0abee9 100644
> --- a/drivers/hid/intel-ish-hid/ishtp-hid.c
> +++ b/drivers/hid/intel-ish-hid/ishtp-hid.c
> @@ -211,10 +211,8 @@ int ishtp_hid_probe(unsigned int cur_hid_dev,
> struct ishtp_hid_data *hid_data;
>
> hid = hid_allocate_device();
> - if (IS_ERR(hid)) {
> - rv = PTR_ERR(hid);
> - return -ENOMEM;
> - }
> + if (IS_ERR(hid))
> + return PTR_ERR(hid);
>

Applied, thank you.

--
Jiri Kosina
SUSE Labs