diff options
Diffstat (limited to 'drivers/input')
-rw-r--r-- | drivers/input/Kconfig | 2 | ||||
-rw-r--r-- | drivers/input/mouse/gpio_mouse.c | 2 | ||||
-rw-r--r-- | drivers/input/mouse/hgpk.c | 2 | ||||
-rw-r--r-- | drivers/input/touchscreen/ads7846.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 5f9d860925a1..cd50c00ab20f 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
@@ -143,7 +143,7 @@ config INPUT_APMPOWER | |||
143 | ---help--- | 143 | ---help--- |
144 | Say Y here if you want suspend key events to trigger a user | 144 | Say Y here if you want suspend key events to trigger a user |
145 | requested suspend through APM. This is useful on embedded | 145 | requested suspend through APM. This is useful on embedded |
146 | systems where such behviour is desired without userspace | 146 | systems where such behaviour is desired without userspace |
147 | interaction. If unsure, say N. | 147 | interaction. If unsure, say N. |
148 | 148 | ||
149 | To compile this driver as a module, choose M here: the | 149 | To compile this driver as a module, choose M here: the |
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c index 0db8d16c5edd..5e5eb88d8d1e 100644 --- a/drivers/input/mouse/gpio_mouse.c +++ b/drivers/input/mouse/gpio_mouse.c | |||
@@ -18,7 +18,7 @@ | |||
18 | 18 | ||
19 | /* | 19 | /* |
20 | * Timer function which is run every scan_ms ms when the device is opened. | 20 | * Timer function which is run every scan_ms ms when the device is opened. |
21 | * The dev input varaible is set to the the input_dev pointer. | 21 | * The dev input variable is set to the the input_dev pointer. |
22 | */ | 22 | */ |
23 | static void gpio_mouse_scan(struct input_polled_dev *dev) | 23 | static void gpio_mouse_scan(struct input_polled_dev *dev) |
24 | { | 24 | { |
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c index 81e6ebf323e9..55cd0fa68339 100644 --- a/drivers/input/mouse/hgpk.c +++ b/drivers/input/mouse/hgpk.c | |||
@@ -381,7 +381,7 @@ static void hgpk_disconnect(struct psmouse *psmouse) | |||
381 | 381 | ||
382 | static void hgpk_recalib_work(struct work_struct *work) | 382 | static void hgpk_recalib_work(struct work_struct *work) |
383 | { | 383 | { |
384 | struct delayed_work *w = container_of(work, struct delayed_work, work); | 384 | struct delayed_work *w = to_delayed_work(work); |
385 | struct hgpk_data *priv = container_of(w, struct hgpk_data, recalib_wq); | 385 | struct hgpk_data *priv = container_of(w, struct hgpk_data, recalib_wq); |
386 | struct psmouse *psmouse = priv->psmouse; | 386 | struct psmouse *psmouse = priv->psmouse; |
387 | 387 | ||
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 7c27c8b9b6d0..056ac77e2cf0 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c | |||
@@ -295,7 +295,7 @@ name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \ | |||
295 | static DEVICE_ATTR(name, S_IRUGO, name ## _show, NULL); | 295 | static DEVICE_ATTR(name, S_IRUGO, name ## _show, NULL); |
296 | 296 | ||
297 | 297 | ||
298 | /* Sysfs conventions report temperatures in millidegrees Celcius. | 298 | /* Sysfs conventions report temperatures in millidegrees Celsius. |
299 | * ADS7846 could use the low-accuracy two-sample scheme, but can't do the high | 299 | * ADS7846 could use the low-accuracy two-sample scheme, but can't do the high |
300 | * accuracy scheme without calibration data. For now we won't try either; | 300 | * accuracy scheme without calibration data. For now we won't try either; |
301 | * userspace sees raw sensor values, and must scale/calibrate appropriately. | 301 | * userspace sees raw sensor values, and must scale/calibrate appropriately. |