Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c45bc9d6 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Len Brown
Browse files

sony-laptop - simplify keymap initialization 



Also use input_set_capability() helper instead of manipulating
bits directly.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 9593bd07

drivers/platform/x86/sony-laptop.c

+8 −12
Original line number Diff line number Diff line
@@ -419,18 +419,15 @@ static int sony_laptop_setup_input(struct acpi_device *acpi_device) 
	key_dev->dev.parent = &acpi_device->dev;



	/* Initialize the Input Drivers: special keys */

	set_bit(EV_KEY, key_dev->evbit);

	set_bit(EV_MSC, key_dev->evbit);

	set_bit(MSC_SCAN, key_dev->mscbit);

	input_set_capability(key_dev, EV_MSC, MSC_SCAN);



	__set_bit(EV_KEY, key_dev->evbit);

	key_dev->keycodesize = sizeof(sony_laptop_input_keycode_map[0]);

	key_dev->keycodemax = ARRAY_SIZE(sony_laptop_input_keycode_map);

	key_dev->keycode = &sony_laptop_input_keycode_map;

	for (i = 0; i < ARRAY_SIZE(sony_laptop_input_keycode_map); i++) {

		if (sony_laptop_input_keycode_map[i] != KEY_RESERVED) {

			set_bit(sony_laptop_input_keycode_map[i],

				key_dev->keybit);

		}

	}

	for (i = 0; i < ARRAY_SIZE(sony_laptop_input_keycode_map); i++)

		__set_bit(sony_laptop_input_keycode_map[i], key_dev->keybit);

	__clear_bit(KEY_RESERVED, key_dev->keybit);



	error = input_register_device(key_dev);

	if (error)
@@ -450,9 +447,8 @@ static int sony_laptop_setup_input(struct acpi_device *acpi_device) 
	jog_dev->id.vendor = PCI_VENDOR_ID_SONY;

	key_dev->dev.parent = &acpi_device->dev;



	jog_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REL);

	jog_dev->keybit[BIT_WORD(BTN_MOUSE)] = BIT_MASK(BTN_MIDDLE);

	jog_dev->relbit[0] = BIT_MASK(REL_WHEEL);

	input_set_capability(jog_dev, EV_KEY, BTN_MIDDLE);

	input_set_capability(jog_dev, EV_REL, REL_WHEEL);



	error = input_register_device(jog_dev);

	if (error)