Message ID | 1617777562-86341-1-git-send-email-jiapeng.chong@linux.alibaba.com |
---|---|
State | New |
Headers | show |
Series | HID: picolcd: remove unused variable | expand |
Hi Jiapeng, This is a dupe of a fix already sent two weeks ago by Lee Jones. see series "Rid W=1 warnings from HID". @Benjamin: At first glance the patch will not break anything. I've had no time though to check what struct hid_device_id.raw_event expects as return value to verify if we can just drop ret or rather effectively should return something specific based on it. Bruno On Wed, 7 Apr 2021 14:39:22 +0800 Jiapeng Chong wrote: > Fix the following gcc warning: > > drivers/hid/hid-picolcd_core.c:332:6: warning: variable ‘ret’ set but > not used [-Wunused-but-set-variable]. > > Reported-by: Abaci Robot <abaci@linux.alibaba.com> > Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> > --- > drivers/hid/hid-picolcd_core.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c > index 1b5c632..682c2a2 100644 > --- a/drivers/hid/hid-picolcd_core.c > +++ b/drivers/hid/hid-picolcd_core.c > @@ -329,7 +329,6 @@ static int picolcd_raw_event(struct hid_device *hdev, > { > struct picolcd_data *data = hid_get_drvdata(hdev); > unsigned long flags; > - int ret = 0; > > if (!data) > return 1; > @@ -342,9 +341,9 @@ static int picolcd_raw_event(struct hid_device *hdev, > > if (report->id == REPORT_KEY_STATE) { > if (data->input_keys) > - ret = picolcd_raw_keypad(data, report, raw_data+1, size-1); > + picolcd_raw_keypad(data, report, raw_data+1, size-1); > } else if (report->id == REPORT_IR_DATA) { > - ret = picolcd_raw_cir(data, report, raw_data+1, size-1); > + picolcd_raw_cir(data, report, raw_data+1, size-1); > } else { > spin_lock_irqsave(&data->lock, flags); > /*
diff --git a/drivers/hid/hid-picolcd_core.c b/drivers/hid/hid-picolcd_core.c index 1b5c632..682c2a2 100644 --- a/drivers/hid/hid-picolcd_core.c +++ b/drivers/hid/hid-picolcd_core.c @@ -329,7 +329,6 @@ static int picolcd_raw_event(struct hid_device *hdev, { struct picolcd_data *data = hid_get_drvdata(hdev); unsigned long flags; - int ret = 0; if (!data) return 1; @@ -342,9 +341,9 @@ static int picolcd_raw_event(struct hid_device *hdev, if (report->id == REPORT_KEY_STATE) { if (data->input_keys) - ret = picolcd_raw_keypad(data, report, raw_data+1, size-1); + picolcd_raw_keypad(data, report, raw_data+1, size-1); } else if (report->id == REPORT_IR_DATA) { - ret = picolcd_raw_cir(data, report, raw_data+1, size-1); + picolcd_raw_cir(data, report, raw_data+1, size-1); } else { spin_lock_irqsave(&data->lock, flags); /*
Fix the following gcc warning: drivers/hid/hid-picolcd_core.c:332:6: warning: variable ‘ret’ set but not used [-Wunused-but-set-variable]. Reported-by: Abaci Robot <abaci@linux.alibaba.com> Signed-off-by: Jiapeng Chong <jiapeng.chong@linux.alibaba.com> --- drivers/hid/hid-picolcd_core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)