diff options
| author | LiXin <li.xin@linaro.org> | 2013-04-07 09:49:55 +0800 |
|---|---|---|
| committer | Guodong Xu <guodong.xu@linaro.org> | 2013-04-07 09:57:17 +0800 |
| commit | d7244794b7983eda774bef24b190a61040e8933f (patch) | |
| tree | a9294e8660550d0e3f7cbaad6a752a790e8d7be1 | |
| parent | f11f215e17bf6f35e6c3e325de5aec870f945c8d (diff) | |
ARM: Hi3620: Fix first parameter of dev_err
Fix first parameter of dev_err in k3_keypad.c
Signed-off-by: LiXin <li.xin@linaro.org>
| -rwxr-xr-x | drivers/input/keyboard/k3_keypad.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/k3_keypad.c b/drivers/input/keyboard/k3_keypad.c index c4944943fc7..03c6debb947 100755 --- a/drivers/input/keyboard/k3_keypad.c +++ b/drivers/input/keyboard/k3_keypad.c @@ -95,7 +95,7 @@ static int k3v2_keypad_open(struct input_dev *dev) int ret = 0; if (keypad == NULL) { - dev_err(dev, "get invalid keypad pointer\n"); + dev_err(&dev->dev, "get invalid keypad pointer\n"); return -EINVAL; } @@ -122,7 +122,7 @@ static void k3v2_keypad_close(struct input_dev *dev) struct k3v2_keypad *keypad = input_get_drvdata(dev); if (keypad == NULL) { - dev_err(dev, "get invalid keypad pointer\n"); + dev_err(&dev->dev, "get invalid keypad pointer\n"); return; } @@ -389,7 +389,7 @@ static struct matrix_keymap_data hisik3_keymap_data = { .keymap_size = ARRAY_SIZE(default_keymap), }; static uint16_t long_func_key1[] = {KEY_BACK}; -static uint16_t long_func_key2[] = {DPAD_CENTER, KEY_VOLUMEDOWN}; +/*static uint16_t long_func_key2[] = {DPAD_CENTER, KEY_VOLUMEDOWN};*/ static struct keypad_remap_item remap_items[] = { {KEY_HOME, 1, 1000/*ms*/, long_func_key1}, @@ -585,7 +585,7 @@ static int k3v2_keypad_remove(struct platform_device* pdev) struct k3v2_keypad *keypad = platform_get_drvdata(pdev); if (keypad == NULL) { - dev_err(dev, "get invalid keypad pointer\n"); + dev_err(&pdev->dev, "get invalid keypad pointer\n"); return -EINVAL; } |