diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-10 08:41:58 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-10 08:41:58 -0700 |
| commit | 5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d (patch) | |
| tree | 819d3f27a826f29210398615f4918a4cd9154836 /drivers/input/tablet | |
| parent | d01d0756f75e7a5b4b43764ad45b83c4340f11d6 (diff) | |
| parent | 6ac8a99b906b01eaceef0057dbee4a225a32c423 (diff) | |
| download | linux-5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d.tar.gz linux-5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d.tar.bz2 linux-5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d.zip | |
Merge branch 'next' into for-linus
Diffstat (limited to 'drivers/input/tablet')
| -rw-r--r-- | drivers/input/tablet/aiptek.c | 15 | ||||
| -rw-r--r-- | drivers/input/tablet/wacom_wac.c | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c index 51b80b08d467..57b25b84d1fc 100644 --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c @@ -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); diff --git a/drivers/input/tablet/wacom_wac.c b/drivers/input/tablet/wacom_wac.c index ce0b4608dad9..40d77ba8fdc1 100644 --- a/drivers/input/tablet/wacom_wac.c +++ b/drivers/input/tablet/wacom_wac.c @@ -687,10 +687,10 @@ static void wacom_tpc_finger_in(struct wacom_wac *wacom, char *data, int idx) * protocol. */ if (wacom->last_finger != finger) { - if (x == input->abs[ABS_X]) + if (x == input_abs_get_val(input, ABS_X)) x++; - if (y == input->abs[ABS_Y]) + if (y == input_abs_get_val(input, ABS_Y)) y++; } |