summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorPeter Ujfalusi2012-11-14 19:10:49 +0100
committerDmitry Torokhov2012-11-24 09:30:16 +0100
commitf32198176598fffdc8dca65a1a719dd9fba7d581 (patch)
treefe9546f212af5f2e205c6520ce2fc835239f830c /drivers/input
parentInput: stmpe-keypad - add support for Device Tree bindings (diff)
downloadkernel-qcow2-linux-f32198176598fffdc8dca65a1a719dd9fba7d581.tar.gz
kernel-qcow2-linux-f32198176598fffdc8dca65a1a719dd9fba7d581.tar.xz
kernel-qcow2-linux-f32198176598fffdc8dca65a1a719dd9fba7d581.zip
Input: twl4030-pwrbutton - switch to using TWL_MODULE_PM_MASTER define
To facilitate upcoming cleanup in twl stack switch from using TWL4030_MODULE_PM_MASTER define to usingTWL_MODULE_PM_MASTER. There are no functional changes. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/twl4030-pwrbutton.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index b3dd96d6448b..27c2bc8aa890 100644
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -39,8 +39,7 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr)
int err;
u8 value;
- err = twl_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &value,
- STS_HW_CONDITIONS);
+ err = twl_i2c_read_u8(TWL_MODULE_PM_MASTER, &value, STS_HW_CONDITIONS);
if (!err) {
pm_wakeup_event(pwr->dev.parent, 0);
input_report_key(pwr, KEY_POWER, value & PWR_PWRON_IRQ);