input device rebranding hacks

trying to maintain old device names seen by userspace

diff --git a/drivers/input/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c
index 38e4b50..05c1a58 100644 (file)
--- a/drivers/input/misc/twl4030-pwrbutton.c
+++ b/drivers/input/misc/twl4030-pwrbutton.c
@@ -66,7 +66,7 @@ static int __init twl4030_pwrbutton_probe(struct platform_device *pdev)
 
        pwr->evbit[0] = BIT_MASK(EV_KEY);
        pwr->keybit[BIT_WORD(KEY_POWER)] = BIT_MASK(KEY_POWER);
-       pwr->name = "twl4030_pwrbutton";
+       pwr->name = "power-button";
        pwr->phys = "twl4030_pwrbutton/input0";
        pwr->dev.parent = &pdev->dev;
 

diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c
index de31ec6..6e8caea 100644 (file)
--- a/drivers/input/touchscreen/ads7846.c
+++ b/drivers/input/touchscreen/ads7846.c
@@ -1281,7 +1281,7 @@ static int __devinit ads7846_probe(struct spi_device *spi)
        ts->wait_for_sync = pdata->wait_for_sync ? : null_wait_for_sync;
 
        snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(&spi->dev));
-       snprintf(ts->name, sizeof(ts->name), "ADS%d Touchscreen", ts->model);
+       snprintf(ts->name, sizeof(ts->name), "touchscreen");
 
        input_dev->name = ts->name;
        input_dev->phys = ts->phys;