Input: cobalt_btns - assorted fixes

 - fix compile errors (keymap is in bdev, not pdev)
 - cdev is no more (must use dev.parent)
 - update copiright notice

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 4833b1a8262..5511ef006a6 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -1,7 +1,7 @@
 /*
  *  Cobalt button interface driver.
  *
- *  Copyright (C) 2007  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
+ *  Copyright (C) 2007-2008  Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <linux/init.h>
 #include <linux/input-polldev.h>
@@ -55,7 +55,7 @@ static void handle_buttons(struct input_polled_dev *dev)
         status = ~readl(bdev->reg) >> 24;
 
         for (i = 0; i < ARRAY_SIZE(bdev->keymap); i++) {
-                if (status & (1UL << i)) {
+                if (status & (1U << i)) {
                         if (++bdev->count[i] == BUTTONS_COUNT_THRESHOLD) {
                                 input_event(input, EV_MSC, MSC_SCAN, i);
                                 input_report_key(input, bdev->keymap[i], 1);
@@ -97,16 +97,16 @@ static int __devinit cobalt_buttons_probe(struct platform_device *pdev)
         input->name = "Cobalt buttons";
         input->phys = "cobalt/input0";
         input->id.bustype = BUS_HOST;
-        input->cdev.dev = &pdev->dev;
+        input->dev.parent = &pdev->dev;
 
-        input->keycode = pdev->keymap;
-        input->keycodemax = ARRAY_SIZE(pdev->keymap);
+        input->keycode = bdev->keymap;
+        input->keycodemax = ARRAY_SIZE(bdev->keymap);
         input->keycodesize = sizeof(unsigned short);
 
         input_set_capability(input, EV_MSC, MSC_SCAN);
         __set_bit(EV_KEY, input->evbit);
-        for (i = 0; i < ARRAY_SIZE(buttons_map); i++)
-                __set_bit(input->keycode[i], input->keybit);
+        for (i = 0; i < ARRAY_SIZE(cobalt_map); i++)
+                __set_bit(bdev->keymap[i], input->keybit);
         __clear_bit(KEY_RESERVED, input->keybit);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);