This renames the twl-pwrbutton interrupt routing from powerbutton_irq to twl_pwrbutton_irq, for better consistency with the driver name. Signed-off-by: Paul Kocialkowski <contact@xxxxxxxx> --- drivers/input/misc/twl-pwrbutton.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/misc/twl-pwrbutton.c b/drivers/input/misc/twl-pwrbutton.c index a7bc8ad..ced702a 100644 --- a/drivers/input/misc/twl-pwrbutton.c +++ b/drivers/input/misc/twl-pwrbutton.c @@ -34,7 +34,7 @@ #define TWL4030_STS_HW_CONDITIONS 0x0f #define TWL6030_STS_HW_CONDITIONS 0x21 -static irqreturn_t powerbutton_irq(int irq, void *_pwr) +static irqreturn_t twl_pwrbutton_irq(int irq, void *_pwr) { struct input_dev *pwr = _pwr; int err; @@ -84,7 +84,7 @@ static int twl_pwrbutton_probe(struct platform_device *pdev) REG_INT_MSK_STS_A); } - err = devm_request_threaded_irq(&pwr->dev, irq, NULL, powerbutton_irq, + err = devm_request_threaded_irq(&pwr->dev, irq, NULL, twl_pwrbutton_irq, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING | IRQF_ONESHOT, "twl_pwrbutton", pwr); -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html