You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Input: switch to input_abs_*() access functions
Change all call sites in drivers/input to not access the ABS axis information directly anymore. Make them use the access helpers instead. Also use input_set_abs_params() when possible. Did some code refactoring as I was on it. Signed-off-by: Daniel Mack <daniel@caiaq.de> Cc: Dmitry Torokhov <dtor@mail.ru> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
committed by
Dmitry Torokhov
parent
7957e9c4d1
commit
987a6c0298
@@ -987,20 +987,17 @@ static int aiptek_program_tablet(struct aiptek *aiptek)
|
||||
/* Query getXextension */
|
||||
if ((ret = aiptek_query(aiptek, 0x01, 0x00)) < 0)
|
||||
return ret;
|
||||
aiptek->inputdev->absmin[ABS_X] = 0;
|
||||
aiptek->inputdev->absmax[ABS_X] = ret - 1;
|
||||
input_set_abs_params(aiptek->inputdev, ABS_X, 0, ret - 1, 0, 0);
|
||||
|
||||
/* Query getYextension */
|
||||
if ((ret = aiptek_query(aiptek, 0x01, 0x01)) < 0)
|
||||
return ret;
|
||||
aiptek->inputdev->absmin[ABS_Y] = 0;
|
||||
aiptek->inputdev->absmax[ABS_Y] = ret - 1;
|
||||
input_set_abs_params(aiptek->inputdev, ABS_Y, 0, ret - 1, 0, 0);
|
||||
|
||||
/* Query getPressureLevels */
|
||||
if ((ret = aiptek_query(aiptek, 0x08, 0x00)) < 0)
|
||||
return ret;
|
||||
aiptek->inputdev->absmin[ABS_PRESSURE] = 0;
|
||||
aiptek->inputdev->absmax[ABS_PRESSURE] = ret - 1;
|
||||
input_set_abs_params(aiptek->inputdev, ABS_PRESSURE, 0, ret - 1, 0, 0);
|
||||
|
||||
/* Depending on whether we are in absolute or relative mode, we will
|
||||
* do a switchToTablet(absolute) or switchToMouse(relative) command.
|
||||
@@ -1054,8 +1051,8 @@ static ssize_t show_tabletSize(struct device *dev, struct device_attribute *attr
|
||||
struct aiptek *aiptek = dev_get_drvdata(dev);
|
||||
|
||||
return snprintf(buf, PAGE_SIZE, "%dx%d\n",
|
||||
aiptek->inputdev->absmax[ABS_X] + 1,
|
||||
aiptek->inputdev->absmax[ABS_Y] + 1);
|
||||
input_abs_get_max(aiptek->inputdev, ABS_X) + 1,
|
||||
input_abs_get_max(aiptek->inputdev, ABS_Y) + 1);
|
||||
}
|
||||
|
||||
/* These structs define the sysfs files, param #1 is the name of the
|
||||
@@ -1843,7 +1840,7 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
|
||||
for (i = 0; i < ARRAY_SIZE(speeds); ++i) {
|
||||
aiptek->curSetting.programmableDelay = speeds[i];
|
||||
(void)aiptek_program_tablet(aiptek);
|
||||
if (aiptek->inputdev->absmax[ABS_X] > 0) {
|
||||
if (input_abs_get_max(aiptek->inputdev, ABS_X) > 0) {
|
||||
dev_info(&intf->dev,
|
||||
"Aiptek using %d ms programming speed\n",
|
||||
aiptek->curSetting.programmableDelay);
|
||||
|
||||
Reference in New Issue
Block a user