input: rename pwrbutton and touchscreen

diff --git a/drivers/i2c/chips/twl4030-pwrbutton.c b/drivers/i2c/chips/twl4030-pwrbutton.c
index cd4d06e..e1eb380 100644 (file)
--- a/drivers/i2c/chips/twl4030-pwrbutton.c
+++ b/drivers/i2c/chips/twl4030-pwrbutton.c
@@ -93,7 +93,7 @@ static int __init twl4030_pwrbutton_init(void)
 
        powerbutton_dev->evbit[0] = BIT_MASK(EV_KEY);
        powerbutton_dev->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
-       powerbutton_dev->name = "triton2-pwrbutton";
+       powerbutton_dev->name = "power-button";
 
        err = input_register_device(powerbutton_dev);
        if (err) {

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index 88f6168..4f79b9d 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -910,7 +910,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
 
        snprintf(ts->phys, sizeof(ts->phys), "%s/input0", spi->dev.bus_id);
 
-       input_dev->name = "ADS784x Touchscreen";
+       input_dev->name = "touchscreen";
        input_dev->phys = ts->phys;
        input_dev->dev.parent = &spi->dev;