diff options
| author | Dmitry Torokhov | 2012-05-11 07:37:08 +0200 |
|---|---|---|
| committer | Dmitry Torokhov | 2012-05-11 07:38:47 +0200 |
| commit | 1932811f426fee71b7ece67e70aeba7e1b0ebb6d (patch) | |
| tree | ffc4598961733707a89e711b4614c8cc14446ad5 /drivers/input/keyboard/pmic8xxx-keypad.c | |
| parent | Input: adp5588 - add support for gpio names (diff) | |
| download | kernel-qcow2-linux-1932811f426fee71b7ece67e70aeba7e1b0ebb6d.tar.gz kernel-qcow2-linux-1932811f426fee71b7ece67e70aeba7e1b0ebb6d.tar.xz kernel-qcow2-linux-1932811f426fee71b7ece67e70aeba7e1b0ebb6d.zip | |
Input: matrix-keymap - uninline and prepare for device tree support
Change matrix-keymap helper to be out-of-line, like sparse keymap,
allow the helper perform basic keymap validation and return errors,
and prepare for device tree support.
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/keyboard/pmic8xxx-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/pmic8xxx-keypad.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c index 01a1c9f8a383..52c34657d301 100644 --- a/drivers/input/keyboard/pmic8xxx-keypad.c +++ b/drivers/input/keyboard/pmic8xxx-keypad.c @@ -626,21 +626,21 @@ static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) kp->input->id.product = 0x0001; kp->input->id.vendor = 0x0001; - kp->input->evbit[0] = BIT_MASK(EV_KEY); - - if (pdata->rep) - __set_bit(EV_REP, kp->input->evbit); - - kp->input->keycode = kp->keycodes; - kp->input->keycodemax = PM8XXX_MATRIX_MAX_SIZE; - kp->input->keycodesize = sizeof(kp->keycodes); kp->input->open = pmic8xxx_kp_open; kp->input->close = pmic8xxx_kp_close; - matrix_keypad_build_keymap(keymap_data, PM8XXX_ROW_SHIFT, - kp->input->keycode, kp->input->keybit); + rc = matrix_keypad_build_keymap(keymap_data, NULL, + PM8XXX_MAX_ROWS, PM8XXX_MAX_COLS, + kp->keycodes, kp->input); + if (rc) { + dev_err(&pdev->dev, "failed to build keymap\n"); + goto err_get_irq; + } + if (pdata->rep) + __set_bit(EV_REP, kp->input->evbit); input_set_capability(kp->input, EV_MSC, MSC_SCAN); + input_set_drvdata(kp->input, kp); /* initialize keypad state */ |