public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Randy Dunlap <rdunlap@xenotime.net>
To: linux-kernel@vger.kernel.org
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>
Subject: [PATCH mmotm] touchscreen/ad787x: don't use bus_id
Date: Mon, 02 Feb 2009 14:00:23 -0800	[thread overview]
Message-ID: <49876CF7.9070100@xenotime.net> (raw)
In-Reply-To: <200902022010.n12KAXcN026264@imap1.linux-foundation.org>

From: Randy Dunlap <randy.dunlap@oracle.com>

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@oracle.com>
cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 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;
 	}

           reply	other threads:[~2009-02-02 22:00 UTC|newest]

Thread overview: expand[flat|nested]  mbox.gz  Atom feed
 [parent not found: <200902022010.n12KAXcN026264@imap1.linux-foundation.org>]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49876CF7.9070100@xenotime.net \
    --to=rdunlap@xenotime.net \
    --cc=akpm@linux-foundation.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox