mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
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>
This commit is contained in:
parent
baadac8b10
commit
3c514387bd
1 changed files with 8 additions and 8 deletions
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue