| Message ID | 20211109082610.131341-1-chi.minghao@zte.com.cn (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 415e701cee5228f168049881624e343d9a3d97bb |
| Delegated to: | Jiri Kosina |
| Headers | show |
| Series | drivers:hid: use swap() to make code cleaner | expand |
Hi, On Tue, Nov 9, 2021 at 9:26 AM <cgel.zte@gmail.com> wrote: > > From: chiminghao <chi.minghao@zte.com.cn> > > Fix the following coccicheck REVIEW: > Use swap() instead of reimplementing it. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: chiminghao <chi.minghao@zte.com.cn> > --- Amended the commit title to match what we do generally in the HID tree and applied to for-5.17/thrustmaster. Thanks for the patch! Cheers, Benjamin > drivers/hid/hid-tmff.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c > index 90acef304536..4040cd98dafe 100644 > --- a/drivers/hid/hid-tmff.c > +++ b/drivers/hid/hid-tmff.c > @@ -78,7 +78,6 @@ static int tmff_play(struct input_dev *dev, void *data, > struct hid_field *ff_field = tmff->ff_field; > int x, y; > int left, right; /* Rumbling */ > - int motor_swap; > > switch (effect->type) { > case FF_CONSTANT: > @@ -104,11 +103,8 @@ static int tmff_play(struct input_dev *dev, void *data, > ff_field->logical_maximum); > > /* 2-in-1 strong motor is left */ > - if (hid->product == THRUSTMASTER_DEVICE_ID_2_IN_1_DT) { > - motor_swap = left; > - left = right; > - right = motor_swap; > - } > + if (hid->product == THRUSTMASTER_DEVICE_ID_2_IN_1_DT) > + swap(left, right); > > dbg_hid("(left,right)=(%08x, %08x)\n", left, right); > ff_field->value[0] = left; > -- > 2.25.1 >
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index 90acef304536..4040cd98dafe 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c @@ -78,7 +78,6 @@ static int tmff_play(struct input_dev *dev, void *data, struct hid_field *ff_field = tmff->ff_field; int x, y; int left, right; /* Rumbling */ - int motor_swap; switch (effect->type) { case FF_CONSTANT: @@ -104,11 +103,8 @@ static int tmff_play(struct input_dev *dev, void *data, ff_field->logical_maximum); /* 2-in-1 strong motor is left */ - if (hid->product == THRUSTMASTER_DEVICE_ID_2_IN_1_DT) { - motor_swap = left; - left = right; - right = motor_swap; - } + if (hid->product == THRUSTMASTER_DEVICE_ID_2_IN_1_DT) + swap(left, right); dbg_hid("(left,right)=(%08x, %08x)\n", left, right); ff_field->value[0] = left;