On Tue, Jan 4, 2022 at 7:24 AM Dmitry Torokhov
<dmitry.torokhov@xxxxxxxxx> wrote:
>
> Hi José,
>
> On Thu, Dec 02, 2021 at 12:08:07PM +0100, José Expósito wrote:
>
> A short description would be appreciated.
>
> Jiri, Benjamin, do you mind if I take this through my tree or you would
> prefer having this split?
No objections from my side:
Acked-by: Benjamin Tissoires <benjamin.tissoires@xxxxxxxxxx>
Cheers,
Benjamin
>
> > Signed-off-by: José Expósito <jose.exposito89@xxxxxxxxx>
> > ---
> > drivers/hid/hid-alps.c | 2 +-
> > drivers/hid/hid-asus.c | 3 +--
> > drivers/hid/hid-elan.c | 3 +--
> > drivers/hid/hid-logitech-hidpp.c | 2 +-
> > drivers/hid/hid-magicmouse.c | 8 ++------
> > drivers/hid/hid-multitouch.c | 2 +-
> > drivers/hid/hid-playstation.c | 3 +--
> > drivers/hid/hid-sony.c | 4 +---
> > drivers/input/keyboard/applespi.c | 2 +-
> > drivers/input/mouse/alps.c | 3 +--
> > drivers/input/mouse/bcm5974.c | 2 +-
> > drivers/input/mouse/cyapa.c | 2 +-
> > drivers/input/mouse/elan_i2c_core.c | 2 +-
> > drivers/input/mouse/elantech.c | 6 ++----
> > drivers/input/mouse/focaltech.c | 4 +---
> > drivers/input/mouse/synaptics.c | 2 +-
> > drivers/input/rmi4/rmi_f30.c | 2 +-
> > drivers/input/rmi4/rmi_f3a.c | 2 +-
> > drivers/input/touchscreen/atmel_mxt_ts.c | 2 +-
> > 19 files changed, 21 insertions(+), 35 deletions(-)
> >
> > diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c
> > index 2b986d0dbde4..4cbfefec949c 100644
> > --- a/drivers/hid/hid-alps.c
> > +++ b/drivers/hid/hid-alps.c
> > @@ -722,7 +722,7 @@ static int alps_input_configured(struct hid_device *hdev, struct hid_input *hi)
> > __set_bit(EV_KEY, input->evbit);
> >
> > if (data->btn_cnt == 1)
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > for (i = 0; i < data->btn_cnt; i++)
> > __set_bit(BTN_LEFT + i, input->keybit);
> > diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c
> > index f3ecddc519ee..99f37b636ec3 100644
> > --- a/drivers/hid/hid-asus.c
> > +++ b/drivers/hid/hid-asus.c
> > @@ -798,8 +798,7 @@ static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi)
> > MAX_PRESSURE, 0, 0);
> > }
> >
> > - __set_bit(BTN_LEFT, input->keybit);
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > ret = input_mt_init_slots(input, drvdata->tp->max_contacts,
> > INPUT_MT_POINTER);
> > diff --git a/drivers/hid/hid-elan.c b/drivers/hid/hid-elan.c
> > index 021049805bb7..b33842b9a92f 100644
> > --- a/drivers/hid/hid-elan.c
> > +++ b/drivers/hid/hid-elan.c
> > @@ -182,8 +182,7 @@ static int elan_input_configured(struct hid_device *hdev, struct hid_input *hi)
> > input_set_abs_params(input, ABS_MT_PRESSURE, 0, ELAN_MAX_PRESSURE,
> > 0, 0);
> >
> > - __set_bit(BTN_LEFT, input->keybit);
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > ret = input_mt_init_slots(input, ELAN_MAX_FINGERS, INPUT_MT_POINTER);
> > if (ret) {
> > diff --git a/drivers/hid/hid-logitech-hidpp.c b/drivers/hid/hid-logitech-hidpp.c
> > index 81de88ab2ecc..d7b8e0ed0b47 100644
> > --- a/drivers/hid/hid-logitech-hidpp.c
> > +++ b/drivers/hid/hid-logitech-hidpp.c
> > @@ -2679,7 +2679,7 @@ static void wtp_populate_input(struct hidpp_device *hidpp,
> > if (hidpp->quirks & HIDPP_QUIRK_WTP_PHYSICAL_BUTTONS)
> > input_set_capability(input_dev, EV_KEY, BTN_RIGHT);
> > else
> > - __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
> > + input_set_property(input_dev, INPUT_PROP_BUTTONPAD);
> >
> > input_mt_init_slots(input_dev, wd->maxcontacts, INPUT_MT_POINTER |
> > INPUT_MT_DROP_UNUSED);
> > diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c
> > index d7687ce70614..2b28c0081362 100644
> > --- a/drivers/hid/hid-magicmouse.c
> > +++ b/drivers/hid/hid-magicmouse.c
> > @@ -545,11 +545,9 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
> >
> > __clear_bit(EV_MSC, input->evbit);
> > __clear_bit(BTN_0, input->keybit);
> > - __clear_bit(BTN_RIGHT, input->keybit);
> > - __clear_bit(BTN_MIDDLE, input->keybit);
> > __set_bit(BTN_MOUSE, input->keybit);
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > __set_bit(BTN_TOOL_FINGER, input->keybit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > mt_flags = INPUT_MT_POINTER | INPUT_MT_DROP_UNUSED |
> > INPUT_MT_TRACK;
> > @@ -559,8 +557,6 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
> > * button (BTN_LEFT == BTN_MOUSE). Make sure we don't
> > * advertise buttons that don't exist...
> > */
> > - __clear_bit(BTN_RIGHT, input->keybit);
> > - __clear_bit(BTN_MIDDLE, input->keybit);
> > __set_bit(BTN_MOUSE, input->keybit);
> > __set_bit(BTN_TOOL_FINGER, input->keybit);
> > __set_bit(BTN_TOOL_DOUBLETAP, input->keybit);
> > @@ -569,7 +565,7 @@ static int magicmouse_setup_input(struct input_dev *input, struct hid_device *hd
> > __set_bit(BTN_TOOL_QUINTTAP, input->keybit);
> > __set_bit(BTN_TOUCH, input->keybit);
> > __set_bit(INPUT_PROP_POINTER, input->propbit);
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> > }
> >
> >
> > diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c
> > index 082376a6cb3d..1bffb1787fd6 100644
> > --- a/drivers/hid/hid-multitouch.c
> > +++ b/drivers/hid/hid-multitouch.c
> > @@ -1287,7 +1287,7 @@ static int mt_touch_input_configured(struct hid_device *hdev,
> > td->is_buttonpad = true;
> >
> > if (td->is_buttonpad)
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > app->pending_palm_slots = devm_kcalloc(&hi->input->dev,
> > BITS_TO_LONGS(td->maxcontacts),
> > diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c
> > index b1b5721b5d8f..50815257ff86 100644
> > --- a/drivers/hid/hid-playstation.c
> > +++ b/drivers/hid/hid-playstation.c
> > @@ -651,8 +651,7 @@ static struct input_dev *ps_touchpad_create(struct hid_device *hdev, int width,
> > return ERR_CAST(touchpad);
> >
> > /* Map button underneath touchpad to BTN_LEFT. */
> > - input_set_capability(touchpad, EV_KEY, BTN_LEFT);
> > - __set_bit(INPUT_PROP_BUTTONPAD, touchpad->propbit);
> > + input_set_property(touchpad, INPUT_PROP_BUTTONPAD);
> >
> > input_set_abs_params(touchpad, ABS_MT_POSITION_X, 0, width - 1, 0, 0);
> > input_set_abs_params(touchpad, ABS_MT_POSITION_Y, 0, height - 1, 0, 0);
> > diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
> > index d1b107d547f5..302fd8fea243 100644
> > --- a/drivers/hid/hid-sony.c
> > +++ b/drivers/hid/hid-sony.c
> > @@ -1519,9 +1519,7 @@ static int sony_register_touchpad(struct sony_sc *sc, int touch_count,
> > sc->touchpad->name = name;
> >
> > /* We map the button underneath the touchpad to BTN_LEFT. */
> > - __set_bit(EV_KEY, sc->touchpad->evbit);
> > - __set_bit(BTN_LEFT, sc->touchpad->keybit);
> > - __set_bit(INPUT_PROP_BUTTONPAD, sc->touchpad->propbit);
> > + input_set_property(sc->touchpad, INPUT_PROP_BUTTONPAD);
> >
> > input_set_abs_params(sc->touchpad, ABS_MT_POSITION_X, 0, w, 0, 0);
> > input_set_abs_params(sc->touchpad, ABS_MT_POSITION_Y, 0, h, 0, 0);
> > diff --git a/drivers/input/keyboard/applespi.c b/drivers/input/keyboard/applespi.c
> > index eda1b23002b5..9fc7608a8bbc 100644
> > --- a/drivers/input/keyboard/applespi.c
> > +++ b/drivers/input/keyboard/applespi.c
> > @@ -1289,7 +1289,7 @@ applespi_register_touchpad_device(struct applespi_data *applespi,
> > input_set_capability(touchpad_input_dev, EV_REL, REL_Y);
> >
> > __set_bit(INPUT_PROP_POINTER, touchpad_input_dev->propbit);
> > - __set_bit(INPUT_PROP_BUTTONPAD, touchpad_input_dev->propbit);
> > + input_set_property(touchpad_input_dev, INPUT_PROP_BUTTONPAD);
> >
> > /* finger touch area */
> > input_set_abs_params(touchpad_input_dev, ABS_MT_TOUCH_MAJOR,
> > diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c
> > index 4a6b33bbe7ea..d04c9553f9f2 100644
> > --- a/drivers/input/mouse/alps.c
> > +++ b/drivers/input/mouse/alps.c
> > @@ -3082,8 +3082,7 @@ int alps_init(struct psmouse *psmouse)
> > dev1->keybit[BIT_WORD(BTN_2)] |= BIT_MASK(BTN_2);
> > dev1->keybit[BIT_WORD(BTN_3)] |= BIT_MASK(BTN_3);
> > } else if (priv->flags & ALPS_BUTTONPAD) {
> > - set_bit(INPUT_PROP_BUTTONPAD, dev1->propbit);
> > - clear_bit(BTN_RIGHT, dev1->keybit);
> > + input_set_property(dev1, INPUT_PROP_BUTTONPAD);
> > } else {
> > dev1->keybit[BIT_WORD(BTN_MIDDLE)] |= BIT_MASK(BTN_MIDDLE);
> > }
> > diff --git a/drivers/input/mouse/bcm5974.c b/drivers/input/mouse/bcm5974.c
> > index 59a14505b9cd..986fed0ef978 100644
> > --- a/drivers/input/mouse/bcm5974.c
> > +++ b/drivers/input/mouse/bcm5974.c
> > @@ -538,7 +538,7 @@ static void setup_events_to_report(struct input_dev *input_dev,
> > __set_bit(BTN_LEFT, input_dev->keybit);
> >
> > if (cfg->caps & HAS_INTEGRATED_BUTTON)
> > - __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
> > + input_set_property(input_dev, INPUT_PROP_BUTTONPAD);
> >
> > input_mt_init_slots(input_dev, MAX_FINGERS,
> > INPUT_MT_POINTER | INPUT_MT_DROP_UNUSED | INPUT_MT_TRACK);
> > diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c
> > index 77cc653edca2..364de350128b 100644
> > --- a/drivers/input/mouse/cyapa.c
> > +++ b/drivers/input/mouse/cyapa.c
> > @@ -501,7 +501,7 @@ static int cyapa_create_input_dev(struct cyapa *cyapa)
> > __set_bit(BTN_RIGHT, input->keybit);
> >
> > if (cyapa->btn_capability == CAPABILITY_LEFT_BTN_MASK)
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > /* Handle pointer emulation and unused slots in core */
> > error = input_mt_init_slots(input, CYAPA_MAX_MT_SLOTS,
> > diff --git a/drivers/input/mouse/elan_i2c_core.c b/drivers/input/mouse/elan_i2c_core.c
> > index 47af62c12267..b6cd6b282424 100644
> > --- a/drivers/input/mouse/elan_i2c_core.c
> > +++ b/drivers/input/mouse/elan_i2c_core.c
> > @@ -1177,7 +1177,7 @@ static int elan_setup_input_device(struct elan_tp_data *data)
> > __set_bit(EV_ABS, input->evbit);
> > __set_bit(INPUT_PROP_POINTER, input->propbit);
> > if (data->clickpad) {
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> > } else {
> > __set_bit(BTN_RIGHT, input->keybit);
> > if (data->middle_button)
> > diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c
> > index 956d9cd34796..38386a89831e 100644
> > --- a/drivers/input/mouse/elantech.c
> > +++ b/drivers/input/mouse/elantech.c
> > @@ -1122,10 +1122,8 @@ static void elantech_set_buttonpad_prop(struct psmouse *psmouse)
> > struct input_dev *dev = psmouse->dev;
> > struct elantech_data *etd = psmouse->private;
> >
> > - if (elantech_is_buttonpad(&etd->info)) {
> > - __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
> > - __clear_bit(BTN_RIGHT, dev->keybit);
> > - }
> > + if (elantech_is_buttonpad(&etd->info))
> > + input_set_property(dev, INPUT_PROP_BUTTONPAD);
> > }
> >
> > /*
> > diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c
> > index 6fd5fff0cbff..292b931483c0 100644
> > --- a/drivers/input/mouse/focaltech.c
> > +++ b/drivers/input/mouse/focaltech.c
> > @@ -330,8 +330,6 @@ static void focaltech_set_input_params(struct psmouse *psmouse)
> > __clear_bit(EV_REL, dev->evbit);
> > __clear_bit(REL_X, dev->relbit);
> > __clear_bit(REL_Y, dev->relbit);
> > - __clear_bit(BTN_RIGHT, dev->keybit);
> > - __clear_bit(BTN_MIDDLE, dev->keybit);
> >
> > /*
> > * Now set up our capabilities.
> > @@ -341,7 +339,7 @@ static void focaltech_set_input_params(struct psmouse *psmouse)
> > input_set_abs_params(dev, ABS_MT_POSITION_Y, 0, priv->y_max, 0, 0);
> > input_set_abs_params(dev, ABS_TOOL_WIDTH, 0, 15, 0, 0);
> > input_mt_init_slots(dev, 5, INPUT_MT_POINTER);
> > - __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
> > + input_set_property(dev, INPUT_PROP_BUTTONPAD);
> > }
> >
> > static int focaltech_read_register(struct ps2dev *ps2dev, int reg,
> > diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
> > index ffad142801b3..1110c85dd370 100644
> > --- a/drivers/input/mouse/synaptics.c
> > +++ b/drivers/input/mouse/synaptics.c
> > @@ -1349,7 +1349,7 @@ static int set_input_params(struct psmouse *psmouse,
> > input_set_capability(dev, EV_KEY, BTN_0 + i);
> >
> > if (SYN_CAP_CLICKPAD(info->ext_cap_0c)) {
> > - __set_bit(INPUT_PROP_BUTTONPAD, dev->propbit);
> > + input_set_property(dev, INPUT_PROP_BUTTONPAD);
> > if (psmouse_matches_pnp_id(psmouse, topbuttonpad_pnp_ids) &&
> > !SYN_CAP_EXT_BUTTONS_STICK(info->ext_cap_10))
> > __set_bit(INPUT_PROP_TOPBUTTONPAD, dev->propbit);
> > diff --git a/drivers/input/rmi4/rmi_f30.c b/drivers/input/rmi4/rmi_f30.c
> > index 35045f161dc2..92ca5a1da1de 100644
> > --- a/drivers/input/rmi4/rmi_f30.c
> > +++ b/drivers/input/rmi4/rmi_f30.c
> > @@ -265,7 +265,7 @@ static int rmi_f30_map_gpios(struct rmi_function *fn,
> > * mapped buttons.
> > */
> > if (pdata->gpio_data.buttonpad || (button - BTN_LEFT == 1))
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > return 0;
> > }
> > diff --git a/drivers/input/rmi4/rmi_f3a.c b/drivers/input/rmi4/rmi_f3a.c
> > index 0e8baed84dbb..4017deff191f 100644
> > --- a/drivers/input/rmi4/rmi_f3a.c
> > +++ b/drivers/input/rmi4/rmi_f3a.c
> > @@ -159,7 +159,7 @@ static int rmi_f3a_map_gpios(struct rmi_function *fn, struct f3a_data *f3a,
> > input->keycodemax = f3a->gpio_count;
> >
> > if (pdata->gpio_data.buttonpad || (button - BTN_LEFT == 1))
> > - __set_bit(INPUT_PROP_BUTTONPAD, input->propbit);
> > + input_set_property(input, INPUT_PROP_BUTTONPAD);
> >
> > return 0;
> > }
> > diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
> > index 05de92c0293b..fd9b6774ee9e 100644
> > --- a/drivers/input/touchscreen/atmel_mxt_ts.c
> > +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
> > @@ -2028,7 +2028,7 @@ static void mxt_set_up_as_touchpad(struct input_dev *input_dev,
> >
> > input_dev->name = "Atmel maXTouch Touchpad";
> >
> > - __set_bit(INPUT_PROP_BUTTONPAD, input_dev->propbit);
> > + input_set_property(input_dev, INPUT_PROP_BUTTONPAD);
> >
> > input_abs_set_res(input_dev, ABS_X, MXT_PIXELS_PER_MM);
> > input_abs_set_res(input_dev, ABS_Y, MXT_PIXELS_PER_MM);
> > --
> > 2.25.1
> >
>
> --
> Dmitry
>
