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: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Jiri Kosina <jkosina@suse.cz> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
parent
f06e6a52ca
commit
aebd636bd6
|
@ -888,8 +888,8 @@ int hidinput_connect(struct hid_device *hid, unsigned int force)
|
||||||
hid->ll_driver->hidinput_input_event;
|
hid->ll_driver->hidinput_input_event;
|
||||||
input_dev->open = hidinput_open;
|
input_dev->open = hidinput_open;
|
||||||
input_dev->close = hidinput_close;
|
input_dev->close = hidinput_close;
|
||||||
input_dev->setkeycode_new = hidinput_setkeycode;
|
input_dev->setkeycode = hidinput_setkeycode;
|
||||||
input_dev->getkeycode_new = hidinput_getkeycode;
|
input_dev->getkeycode = hidinput_getkeycode;
|
||||||
|
|
||||||
input_dev->name = hid->name;
|
input_dev->name = hid->name;
|
||||||
input_dev->phys = hid->phys;
|
input_dev->phys = hid->phys;
|
||||||
|
|
|
@ -806,22 +806,9 @@ int input_get_keycode(struct input_dev *dev, struct input_keymap_entry *ke)
|
||||||
int retval;
|
int retval;
|
||||||
|
|
||||||
spin_lock_irqsave(&dev->event_lock, flags);
|
spin_lock_irqsave(&dev->event_lock, flags);
|
||||||
|
retval = dev->getkeycode(dev, ke);
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
spin_unlock_irqrestore(&dev->event_lock, flags);
|
spin_unlock_irqrestore(&dev->event_lock, flags);
|
||||||
|
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(input_get_keycode);
|
EXPORT_SYMBOL(input_get_keycode);
|
||||||
|
@ -846,35 +833,7 @@ int input_set_keycode(struct input_dev *dev,
|
||||||
|
|
||||||
spin_lock_irqsave(&dev->event_lock, flags);
|
spin_lock_irqsave(&dev->event_lock, flags);
|
||||||
|
|
||||||
if (dev->setkeycode) {
|
retval = dev->setkeycode(dev, ke, &old_keycode);
|
||||||
/*
|
|
||||||
* 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);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (retval)
|
if (retval)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
@ -1861,11 +1820,11 @@ int input_register_device(struct input_dev *dev)
|
||||||
dev->rep[REP_PERIOD] = 33;
|
dev->rep[REP_PERIOD] = 33;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dev->getkeycode && !dev->getkeycode_new)
|
if (!dev->getkeycode)
|
||||||
dev->getkeycode_new = input_default_getkeycode;
|
dev->getkeycode = input_default_getkeycode;
|
||||||
|
|
||||||
if (!dev->setkeycode && !dev->setkeycode_new)
|
if (!dev->setkeycode)
|
||||||
dev->setkeycode_new = input_default_setkeycode;
|
dev->setkeycode = input_default_setkeycode;
|
||||||
|
|
||||||
dev_set_name(&dev->dev, "input%ld",
|
dev_set_name(&dev->dev, "input%ld",
|
||||||
(unsigned long) atomic_inc_return(&input_no) - 1);
|
(unsigned long) atomic_inc_return(&input_no) - 1);
|
||||||
|
|
|
@ -612,8 +612,8 @@ static int ati_remote2_input_init(struct ati_remote2 *ar2)
|
||||||
idev->open = ati_remote2_open;
|
idev->open = ati_remote2_open;
|
||||||
idev->close = ati_remote2_close;
|
idev->close = ati_remote2_close;
|
||||||
|
|
||||||
idev->getkeycode_new = ati_remote2_getkeycode;
|
idev->getkeycode = ati_remote2_getkeycode;
|
||||||
idev->setkeycode_new = ati_remote2_setkeycode;
|
idev->setkeycode = ati_remote2_setkeycode;
|
||||||
|
|
||||||
idev->name = ar2->name;
|
idev->name = ar2->name;
|
||||||
idev->phys = ar2->phys;
|
idev->phys = ar2->phys;
|
||||||
|
|
|
@ -210,8 +210,8 @@ int sparse_keymap_setup(struct input_dev *dev,
|
||||||
|
|
||||||
dev->keycode = map;
|
dev->keycode = map;
|
||||||
dev->keycodemax = map_size;
|
dev->keycodemax = map_size;
|
||||||
dev->getkeycode_new = sparse_keymap_getkeycode;
|
dev->getkeycode = sparse_keymap_getkeycode;
|
||||||
dev->setkeycode_new = sparse_keymap_setkeycode;
|
dev->setkeycode = sparse_keymap_setkeycode;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
|
@ -198,8 +198,8 @@ static int legacy_dvb_usb_remote_init(struct dvb_usb_device *d)
|
||||||
d->input_dev = input_dev;
|
d->input_dev = input_dev;
|
||||||
d->rc_dev = NULL;
|
d->rc_dev = NULL;
|
||||||
|
|
||||||
input_dev->getkeycode_new = legacy_dvb_usb_getkeycode;
|
input_dev->getkeycode = legacy_dvb_usb_getkeycode;
|
||||||
input_dev->setkeycode_new = legacy_dvb_usb_setkeycode;
|
input_dev->setkeycode = legacy_dvb_usb_setkeycode;
|
||||||
|
|
||||||
/* set the bits for the keys */
|
/* set the bits for the keys */
|
||||||
deb_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size);
|
deb_rc("key map size: %d\n", d->props.rc.legacy.rc_map_size);
|
||||||
|
|
|
@ -966,8 +966,8 @@ struct rc_dev *rc_allocate_device(void)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->input_dev->getkeycode_new = ir_getkeycode;
|
dev->input_dev->getkeycode = ir_getkeycode;
|
||||||
dev->input_dev->setkeycode_new = ir_setkeycode;
|
dev->input_dev->setkeycode = ir_setkeycode;
|
||||||
input_set_drvdata(dev->input_dev, dev);
|
input_set_drvdata(dev->input_dev, dev);
|
||||||
|
|
||||||
spin_lock_init(&dev->rc_map.lock);
|
spin_lock_init(&dev->rc_map.lock);
|
||||||
|
|
|
@ -1154,8 +1154,6 @@ struct ff_effect {
|
||||||
* sparse keymaps. If not supplied default mechanism will be used.
|
* sparse keymaps. If not supplied default mechanism will be used.
|
||||||
* The method is being called while holding event_lock and thus must
|
* The method is being called while holding event_lock and thus must
|
||||||
* not sleep
|
* not sleep
|
||||||
* @getkeycode_new: transition method
|
|
||||||
* @setkeycode_new: transition method
|
|
||||||
* @ff: force feedback structure associated with the device if device
|
* @ff: force feedback structure associated with the device if device
|
||||||
* supports force feedback effects
|
* supports force feedback effects
|
||||||
* @repeat_key: stores key code of the last key pressed; used to implement
|
* @repeat_key: stores key code of the last key pressed; used to implement
|
||||||
|
@ -1234,14 +1232,10 @@ struct input_dev {
|
||||||
void *keycode;
|
void *keycode;
|
||||||
|
|
||||||
int (*setkeycode)(struct input_dev *dev,
|
int (*setkeycode)(struct input_dev *dev,
|
||||||
unsigned int scancode, unsigned int keycode);
|
const struct input_keymap_entry *ke,
|
||||||
|
unsigned int *old_keycode);
|
||||||
int (*getkeycode)(struct input_dev *dev,
|
int (*getkeycode)(struct input_dev *dev,
|
||||||
unsigned int scancode, unsigned int *keycode);
|
struct input_keymap_entry *ke);
|
||||||
int (*setkeycode_new)(struct input_dev *dev,
|
|
||||||
const struct input_keymap_entry *ke,
|
|
||||||
unsigned int *old_keycode);
|
|
||||||
int (*getkeycode_new)(struct input_dev *dev,
|
|
||||||
struct input_keymap_entry *ke);
|
|
||||||
|
|
||||||
struct ff_device *ff;
|
struct ff_device *ff;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue