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

Commit aebd636b authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: switch completely over to the new versions of get/setkeycode



All users of old style get/setkeycode methids have been converted so
it is time to retire them.

Acked-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
Acked-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent f06e6a52
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -888,8 +888,8 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
					hid->ll_driver->hidinput_input_event;
				input_dev->open = hidinput_open;
				input_dev->close = hidinput_close;
				input_dev->setkeycode_new = hidinput_setkeycode;
				input_dev->getkeycode_new = hidinput_getkeycode;
				input_dev->setkeycode = hidinput_setkeycode;
				input_dev->getkeycode = hidinput_getkeycode;

				input_dev->name = hid->name;
				input_dev->phys = hid->phys;
+7 −48
Original line number Diff line number Diff line
@@ -806,22 +806,9 @@ int input_get_keycode(struct input_dev *dev, struct input_keymap_entry *ke)
	int retval;

	spin_lock_irqsave(&dev->event_lock, flags);

	if (dev->getkeycode) {
		/*
		 * Support for legacy drivers, that don't implement the new
		 * ioctls
		 */
		u32 scancode = ke->index;

		memcpy(ke->scancode, &scancode, sizeof(scancode));
		ke->len = sizeof(scancode);
		retval = dev->getkeycode(dev, scancode, &ke->keycode);
	} else {
		retval = dev->getkeycode_new(dev, ke);
	}

	retval = dev->getkeycode(dev, ke);
	spin_unlock_irqrestore(&dev->event_lock, flags);

	return retval;
}
EXPORT_SYMBOL(input_get_keycode);
@@ -846,35 +833,7 @@ int input_set_keycode(struct input_dev *dev,

	spin_lock_irqsave(&dev->event_lock, flags);

	if (dev->setkeycode) {
		/*
		 * Support for legacy drivers, that don't implement the new
		 * ioctls
		 */
		unsigned int scancode;

		retval = input_scancode_to_scalar(ke, &scancode);
		if (retval)
			goto out;

		/*
		 * We need to know the old scancode, in order to generate a
		 * keyup effect, if the set operation happens successfully
		 */
		if (!dev->getkeycode) {
			retval = -EINVAL;
			goto out;
		}

		retval = dev->getkeycode(dev, scancode, &old_keycode);
		if (retval)
			goto out;

		retval = dev->setkeycode(dev, scancode, ke->keycode);
	} else {
		retval = dev->setkeycode_new(dev, ke, &old_keycode);
	}

	retval = dev->setkeycode(dev, ke, &old_keycode);
	if (retval)
		goto out;

@@ -1861,11 +1820,11 @@ int input_register_device(struct input_dev *dev)
		dev->rep[REP_PERIOD] = 33;
	}

	if (!dev->getkeycode && !dev->getkeycode_new)
		dev->getkeycode_new = input_default_getkeycode;
	if (!dev->getkeycode)
		dev->getkeycode = input_default_getkeycode;

	if (!dev->setkeycode && !dev->setkeycode_new)
		dev->setkeycode_new = input_default_setkeycode;
	if (!dev->setkeycode)
		dev->setkeycode = input_default_setkeycode;

	dev_set_name(&dev->dev, "input%ld",
		     (unsigned long) atomic_inc_return(&input_no) - 1);
+2 −2
Original line number Diff line number Diff line
@@ -612,8 +612,8 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
	idev->open = ati_remote2_open;
	idev->close = ati_remote2_close;

	idev->getkeycode_new = ati_remote2_getkeycode;
	idev->setkeycode_new = ati_remote2_setkeycode;
	idev->getkeycode = ati_remote2_getkeycode;
	idev->setkeycode = ati_remote2_setkeycode;

	idev->name = ar2->name;
	idev->phys = ar2->phys;
+2 −2
Original line number Diff line number Diff line
@@ -210,8 +210,8 @@ int sparse_keymap_setup(struct input_dev *dev,

	dev->keycode = map;
	dev->keycodemax = map_size;
	dev->getkeycode_new = sparse_keymap_getkeycode;
	dev->setkeycode_new = sparse_keymap_setkeycode;
	dev->getkeycode = sparse_keymap_getkeycode;
	dev->setkeycode = sparse_keymap_setkeycode;

	return 0;

+2 −2
Original line number Diff line number Diff line
@@ -198,8 +198,8 @@ static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d)
	d->input_dev = input_dev;
	d->rc_dev = NULL;

	input_dev->getkeycode_new = legacy_dvb_usb_getkeycode;
	input_dev->setkeycode_new = legacy_dvb_usb_setkeycode;
	input_dev->getkeycode = legacy_dvb_usb_getkeycode;
	input_dev->setkeycode = legacy_dvb_usb_setkeycode;

	/* set the bits for the keys */
	deb_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size);
Loading