[PATCH mmotm] touchscreen/ad787x: don't use bus_id

[Randy Dunlap]

From: Randy Dunlap <randy.dunlap@xxxxxxxxxx>

drivers/input/touchscreen/ad7879.c:421: error: 'struct device' has no member named 'bus_id'
drivers/input/touchscreen/ad7877.c:716: error: 'struct device' has no member named 'bus_id'
drivers/input/touchscreen/ad7877.c:743: error: 'struct device' has no member named 'bus_id'

Signed-off-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
cc: Dmitry Torokhov <dmitry.torokhov@xxxxxxxxx>
---
 drivers/input/touchscreen/ad7877.c |    6 +++---
 drivers/input/touchscreen/ad7879.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

--- mmotm-2009-0202-1210.orig/drivers/input/touchscreen/ad7879.c
+++ mmotm-2009-0202-1210/drivers/input/touchscreen/ad7879.c
@@ -418,7 +418,7 @@ static int __devinit ad7879_construct(bu
 	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;
--- mmotm-2009-0202-1210.orig/drivers/input/touchscreen/ad7877.c
+++ mmotm-2009-0202-1210/drivers/input/touchscreen/ad7877.c
@@ -713,7 +713,7 @@ static int __devinit ad7877_probe(struct
 	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 @@ static int __devinit ad7877_probe(struct
 	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;
 	}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/