diff options
author | Nick Dyer <nick.dyer@itdev.co.uk> | 2016-05-19 12:22:49 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2016-05-19 12:35:16 -0400 |
commit | e9000b7978541f73a4bc100117fd417ab08a2a60 (patch) | |
tree | 1cf18a3b14d4481a8b106931763239db9db9206e /drivers/input/rmi4 | |
parent | c32feb03aefa8c5aada929ad10fd8aa569ef45cd (diff) |
Input: synaptics-rmi4 - fix spelling in defines
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
Reviewed-by: Andrew Duggan <aduggan@synaptics.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/rmi4')
-rw-r--r-- | drivers/input/rmi4/rmi_f01.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/input/rmi4/rmi_f01.c b/drivers/input/rmi4/rmi_f01.c index eb362bc71a4c..fac81fc9bcf6 100644 --- a/drivers/input/rmi4/rmi_f01.c +++ b/drivers/input/rmi4/rmi_f01.c | |||
@@ -81,26 +81,26 @@ struct f01_basic_properties { | |||
81 | * This bit disables whatever sleep mode may be selected by the sleep_mode | 81 | * This bit disables whatever sleep mode may be selected by the sleep_mode |
82 | * field and forces the device to run at full power without sleeping. | 82 | * field and forces the device to run at full power without sleeping. |
83 | */ | 83 | */ |
84 | #define RMI_F01_CRTL0_NOSLEEP_BIT BIT(2) | 84 | #define RMI_F01_CTRL0_NOSLEEP_BIT BIT(2) |
85 | 85 | ||
86 | /* | 86 | /* |
87 | * When this bit is set, the touch controller employs a noise-filtering | 87 | * When this bit is set, the touch controller employs a noise-filtering |
88 | * algorithm designed for use with a connected battery charger. | 88 | * algorithm designed for use with a connected battery charger. |
89 | */ | 89 | */ |
90 | #define RMI_F01_CRTL0_CHARGER_BIT BIT(5) | 90 | #define RMI_F01_CTRL0_CHARGER_BIT BIT(5) |
91 | 91 | ||
92 | /* | 92 | /* |
93 | * Sets the report rate for the device. The effect of this setting is | 93 | * Sets the report rate for the device. The effect of this setting is |
94 | * highly product dependent. Check the spec sheet for your particular | 94 | * highly product dependent. Check the spec sheet for your particular |
95 | * touch sensor. | 95 | * touch sensor. |
96 | */ | 96 | */ |
97 | #define RMI_F01_CRTL0_REPORTRATE_BIT BIT(6) | 97 | #define RMI_F01_CTRL0_REPORTRATE_BIT BIT(6) |
98 | 98 | ||
99 | /* | 99 | /* |
100 | * Written by the host as an indicator that the device has been | 100 | * Written by the host as an indicator that the device has been |
101 | * successfully configured. | 101 | * successfully configured. |
102 | */ | 102 | */ |
103 | #define RMI_F01_CRTL0_CONFIGURED_BIT BIT(7) | 103 | #define RMI_F01_CTRL0_CONFIGURED_BIT BIT(7) |
104 | 104 | ||
105 | /** | 105 | /** |
106 | * @ctrl0 - see the bit definitions above. | 106 | * @ctrl0 - see the bit definitions above. |
@@ -330,10 +330,10 @@ static int rmi_f01_probe(struct rmi_function *fn) | |||
330 | case RMI_F01_NOSLEEP_DEFAULT: | 330 | case RMI_F01_NOSLEEP_DEFAULT: |
331 | break; | 331 | break; |
332 | case RMI_F01_NOSLEEP_OFF: | 332 | case RMI_F01_NOSLEEP_OFF: |
333 | f01->device_control.ctrl0 &= ~RMI_F01_CRTL0_NOSLEEP_BIT; | 333 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT; |
334 | break; | 334 | break; |
335 | case RMI_F01_NOSLEEP_ON: | 335 | case RMI_F01_NOSLEEP_ON: |
336 | f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT; | 336 | f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT; |
337 | break; | 337 | break; |
338 | } | 338 | } |
339 | 339 | ||
@@ -349,7 +349,7 @@ static int rmi_f01_probe(struct rmi_function *fn) | |||
349 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; | 349 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; |
350 | } | 350 | } |
351 | 351 | ||
352 | f01->device_control.ctrl0 |= RMI_F01_CRTL0_CONFIGURED_BIT; | 352 | f01->device_control.ctrl0 |= RMI_F01_CTRL0_CONFIGURED_BIT; |
353 | 353 | ||
354 | error = rmi_write(rmi_dev, fn->fd.control_base_addr, | 354 | error = rmi_write(rmi_dev, fn->fd.control_base_addr, |
355 | f01->device_control.ctrl0); | 355 | f01->device_control.ctrl0); |
@@ -535,8 +535,8 @@ static int rmi_f01_suspend(struct rmi_function *fn) | |||
535 | int error; | 535 | int error; |
536 | 536 | ||
537 | f01->old_nosleep = | 537 | f01->old_nosleep = |
538 | f01->device_control.ctrl0 & RMI_F01_CRTL0_NOSLEEP_BIT; | 538 | f01->device_control.ctrl0 & RMI_F01_CTRL0_NOSLEEP_BIT; |
539 | f01->device_control.ctrl0 &= ~RMI_F01_CRTL0_NOSLEEP_BIT; | 539 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_NOSLEEP_BIT; |
540 | 540 | ||
541 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; | 541 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; |
542 | if (device_may_wakeup(fn->rmi_dev->xport->dev)) | 542 | if (device_may_wakeup(fn->rmi_dev->xport->dev)) |
@@ -549,7 +549,7 @@ static int rmi_f01_suspend(struct rmi_function *fn) | |||
549 | if (error) { | 549 | if (error) { |
550 | dev_err(&fn->dev, "Failed to write sleep mode: %d.\n", error); | 550 | dev_err(&fn->dev, "Failed to write sleep mode: %d.\n", error); |
551 | if (f01->old_nosleep) | 551 | if (f01->old_nosleep) |
552 | f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT; | 552 | f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT; |
553 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; | 553 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; |
554 | f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL; | 554 | f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL; |
555 | return error; | 555 | return error; |
@@ -564,7 +564,7 @@ static int rmi_f01_resume(struct rmi_function *fn) | |||
564 | int error; | 564 | int error; |
565 | 565 | ||
566 | if (f01->old_nosleep) | 566 | if (f01->old_nosleep) |
567 | f01->device_control.ctrl0 |= RMI_F01_CRTL0_NOSLEEP_BIT; | 567 | f01->device_control.ctrl0 |= RMI_F01_CTRL0_NOSLEEP_BIT; |
568 | 568 | ||
569 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; | 569 | f01->device_control.ctrl0 &= ~RMI_F01_CTRL0_SLEEP_MODE_MASK; |
570 | f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL; | 570 | f01->device_control.ctrl0 |= RMI_SLEEP_MODE_NORMAL; |