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>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index 347fbd4e2d5..b2b9415d874 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -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);
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 512a2f4ada0..c3769283936 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -966,8 +966,8 @@ struct rc_dev *rc_allocate_device(void)
                 return NULL;
         }
 
-        dev->input_dev->getkeycode_new = ir_getkeycode;
-        dev->input_dev->setkeycode_new = ir_setkeycode;
+        dev->input_dev->getkeycode = ir_getkeycode;
+        dev->input_dev->setkeycode = ir_setkeycode;
         input_set_drvdata(dev->input_dev, dev);
 
         spin_lock_init(&dev->rc_map.lock);