Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] Input: convert hdaps to dynamic input_dev allocation.

Browse source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dmitry Torokhov 2005-11-10 22:10:55 -05:00 committed by Linus Torvalds
parent 5e04e7fe77
commit d12eb7e11c
1 changed files with 23 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
drivers/hwmon/hdaps.c
View file

@ -60,9 +60,11 @@
#define HDAPS_POLL_PERIOD (HZ/20) /* poll for input every 1/20s */ #define HDAPS_POLL_PERIOD (HZ/20) /* poll for input every 1/20s */
#define HDAPS_INPUT_FUZZ 4 /* input event threshold */ #define HDAPS_INPUT_FUZZ 4 /* input event threshold */
#define HDAPS_INPUT_FLAT 4
static struct timer_list hdaps_timer; static struct timer_list hdaps_timer;
static struct platform_device *pdev; static struct platform_device *pdev;
static struct input_dev *hdaps_idev;
static unsigned int hdaps_invert; static unsigned int hdaps_invert;
static u8 km_activity; static u8 km_activity;
static int rest_x; static int rest_x;
@ -309,18 +311,6 @@ static struct device_driver hdaps_driver = {
.resume = hdaps_resume .resume = hdaps_resume
}; };
/* Input class stuff */
static struct input_dev hdaps_idev = {
.name = "hdaps",
.evbit = { BIT(EV_ABS) },
.absbit = { BIT(ABS_X) | BIT(ABS_Y) },
.absmin = { [ABS_X] = -256, [ABS_Y] = -256 },
.absmax = { [ABS_X] = 256, [ABS_Y] = 256 },
.absfuzz = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
.absflat = { [ABS_X] = HDAPS_INPUT_FUZZ, [ABS_Y] = HDAPS_INPUT_FUZZ },
};
/* /*
* hdaps_calibrate - Set our "resting" values. Callers must hold hdaps_sem. * hdaps_calibrate - Set our "resting" values. Callers must hold hdaps_sem.
*/ */
@ -342,9 +332,9 @@ static void hdaps_mousedev_poll(unsigned long unused)
if (__hdaps_read_pair(HDAPS_PORT_XPOS, HDAPS_PORT_YPOS, &x, &y)) if (__hdaps_read_pair(HDAPS_PORT_XPOS, HDAPS_PORT_YPOS, &x, &y))
goto out; goto out;
input_report_abs(&hdaps_idev, ABS_X, x - rest_x); input_report_abs(hdaps_idev, ABS_X, x - rest_x);
input_report_abs(&hdaps_idev, ABS_Y, y - rest_y); input_report_abs(hdaps_idev, ABS_Y, y - rest_y);
input_sync(&hdaps_idev); input_sync(hdaps_idev);
mod_timer(&hdaps_timer, jiffies + HDAPS_POLL_PERIOD); mod_timer(&hdaps_timer, jiffies + HDAPS_POLL_PERIOD);
@ -564,12 +554,25 @@ static int __init hdaps_init(void)
if (ret) if (ret)
goto out_device; goto out_device;
hdaps_idev = input_allocate_device();
if (!hdaps_idev) {
ret = -ENOMEM;
goto out_group;
}
/* initial calibrate for the input device */ /* initial calibrate for the input device */
hdaps_calibrate(); hdaps_calibrate();
/* initialize the input class */ /* initialize the input class */
hdaps_idev.dev = &pdev->dev; hdaps_idev->name = "hdaps";
input_register_device(&hdaps_idev); hdaps_idev->cdev.dev = &pdev->dev;
hdaps_idev->evbit[0] = BIT(EV_ABS);
input_set_abs_params(hdaps_idev, ABS_X,
-256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
input_set_abs_params(hdaps_idev, ABS_X,
-256, 256, HDAPS_INPUT_FUZZ, HDAPS_INPUT_FLAT);
input_register_device(hdaps_idev);
/* start up our timer for the input device */ /* start up our timer for the input device */
init_timer(&hdaps_timer); init_timer(&hdaps_timer);
@ -580,6 +583,8 @@ static int __init hdaps_init(void)
printk(KERN_INFO "hdaps: driver successfully loaded.\n"); printk(KERN_INFO "hdaps: driver successfully loaded.\n");
return 0; return 0;
out_group:
sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group);
out_device: out_device:
platform_device_unregister(pdev); platform_device_unregister(pdev);
out_driver: out_driver:
@ -594,7 +599,7 @@ static int __init hdaps_init(void)
static void __exit hdaps_exit(void) static void __exit hdaps_exit(void)
{ {
del_timer_sync(&hdaps_timer); del_timer_sync(&hdaps_timer);
input_unregister_device(&hdaps_idev); input_unregister_device(hdaps_idev);
sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group); sysfs_remove_group(&pdev->dev.kobj, &hdaps_attribute_group);
platform_device_unregister(pdev); platform_device_unregister(pdev);
driver_unregister(&hdaps_driver); driver_unregister(&hdaps_driver);