The patch titled
apanel: use generic keycode routines
has been removed from the -mm tree. Its filename was
apanel-use-generic-keycode-routines.patch
This patch was dropped because it was folded into fujitsu-application-panel-driver.patch
------------------------------------------------------
Subject: apanel: use generic keycode routines
From: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Don't need driver specific keymap routines, generic keycode routines will work
fine.
Signed-off-by: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
Cc: Dmitry Torokhov <dtor@xxxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/input/misc/apanel.c | 31 ++-----------------------------
1 file changed, 2 insertions(+), 29 deletions(-)
diff -puN drivers/input/misc/apanel.c~apanel-use-generic-keycode-routines drivers/input/misc/apanel.c
--- a/drivers/input/misc/apanel.c~apanel-use-generic-keycode-routines
+++ a/drivers/input/misc/apanel.c
@@ -120,33 +120,6 @@ static void apanel_poll(struct input_pol
report_key(idev, ap->keymap[i]);
}
-static int apanel_getkeycode(struct input_dev *idev, int scancode, int *keycode)
-{
- struct apanel *ap = idev->private;
-
- if (scancode < 0 || scancode >= MAX_PANEL_KEYS)
- return -EINVAL;
-
- *keycode = ap->keymap[scancode];
- return 0;
-}
-
-static int apanel_setkeycode(struct input_dev *idev, int scancode, int keycode)
-{
- struct apanel *ap = idev->private;
-
- if (keycode < 0 || keycode > KEY_MAX)
- return -EINVAL;
-
- if (scancode < 0 || scancode >= MAX_PANEL_KEYS)
- return -EINVAL;
-
- clear_bit(ap->keymap[scancode], idev->keybit);
- ap->keymap[scancode] = keycode;
- set_bit(keycode, idev->keybit);
- return 0;
-}
-
/* Track state changes of LED */
static void led_update(struct work_struct *work)
{
@@ -274,11 +247,11 @@ static int apanel_probe(struct i2c_adapt
idev->phys = "apanel/input0";
idev->id.bustype = BUS_HOST;
idev->dev.parent = &ap->client.dev;
- idev->getkeycode = apanel_getkeycode;
- idev->setkeycode = apanel_setkeycode;
set_bit(EV_KEY, idev->evbit);
+ idev->keycode = ap->keymap;
+ idev->keycodesize = sizeof(ap->keymap[0]);
idev->keycodemax = (device_chip[APANEL_DEV_CDBTN] != CHIP_NONE) ? 12 : 4;
for (i = 0; i < idev->keycodemax; i++)
_
Patches currently in -mm which might be from shemminger@xxxxxxxxxxxxxxxxxxxx are
git-input.patch
fujitsu-application-panel-driver.patch
apanel-use-generic-keycode-routines.patch
fujitsu-application-panel-led-value.patch
git-net.patch
git-netdev-all.patch
git-wireless.patch
bonding-locking-fix.patch
bridge-assign-random-address.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
