Title: [6056] trunk/drivers/input/touchscreen: Apply upstream input-ad7879-touchscreen-driver-dont-use-bus_id.patch
- Revision
- 6056
- Author
- hennerich
- Date
- 2009-02-04 04:21:43 -0600 (Wed, 04 Feb 2009)
Log Message
Apply upstream input-ad7879-touchscreen-driver-dont-use-bus_id.patch
Modified Paths
Diff
Modified: trunk/drivers/input/touchscreen/ad7877.c (6055 => 6056)
--- trunk/drivers/input/touchscreen/ad7877.c 2009-02-04 06:53:44 UTC (rev 6055)
+++ trunk/drivers/input/touchscreen/ad7877.c 2009-02-04 10:21:43 UTC (rev 6056)
@@ -713,7 +713,7 @@
ts->averaging = pdata->averaging;
ts->pen_down_acc_interval = pdata->pen_down_acc_interval;
- snprintf(ts->phys, sizeof(ts->phys), "%s/inputX", spi->dev.bus_id);
+ snprintf(ts->phys, sizeof(ts->phys), "%s/inputX", dev_name(&spi->dev));
input_dev->name = "AD7877 Touchscreen";
input_dev->phys = ts->phys;
@@ -740,8 +740,8 @@
verify = ad7877_read(spi, AD7877_REG_SEQ1);
if (verify != AD7877_MM_SEQUENCE){
- dev_err(&spi->dev, "%s: Failed to probe %s\n", spi->dev.bus_id,
- input_dev->name);
+ dev_err(&spi->dev, "%s: Failed to probe %s\n",
+ dev_name(&spi->dev), input_dev->name);
err = -ENODEV;
goto err_free_mem;
}
Modified: trunk/drivers/input/touchscreen/ad7879.c (6055 => 6056)
--- trunk/drivers/input/touchscreen/ad7879.c 2009-02-04 06:53:44 UTC (rev 6055)
+++ trunk/drivers/input/touchscreen/ad7879.c 2009-02-04 10:21:43 UTC (rev 6056)
@@ -418,7 +418,7 @@
else
ts->gpio_init = AD7879_GPIO_EN | AD7879_GPIODIR;
- snprintf(ts->phys, sizeof(ts->phys), "%s/inputX", bus->dev.bus_id);
+ snprintf(ts->phys, sizeof(ts->phys), "%s/inputX", dev_name(&bus->dev));
input_dev->name = "AD7879 Touchscreen";
input_dev->phys = ts->phys;
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
