public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Richard Knutsson <ricknu-0@student.ltu.se>
To: linux-kernel@vger.kernel.org
Subject: [PATCH 3/3] *rest*: Replace driver_data with dev_[gs]et_drvdata
Date: Mon, 05 Dec 2005 06:58:16 +0100	[thread overview]
Message-ID: <4393D6F8.1080303@student.ltu.se> (raw)
In-Reply-To: <20051205055215.14897.44730.sendpatchset@thinktank.campus.ltu.se>

From: Richard Knutsson <ricknu-0@student.ltu.se>

Replace (found) dev->driver_data with dev_[gs]et_drvdata().

Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>

---

 ide/ide.c      |    4 ++--
 scsi/aha1740.c |    2 +-
 usb/core/usb.c |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff -Narup a/drivers/ide/ide.c b/drivers/ide/ide.c
--- a/drivers/ide/ide.c	2005-12-02 14:46:04.000000000 +0100
+++ b/drivers/ide/ide.c	2005-12-02 14:48:47.000000000 +0100
@@ -1216,7 +1216,7 @@ EXPORT_SYMBOL(system_bus_clock);
 
 static int generic_ide_suspend(struct device *dev, pm_message_t state)
 {
-	ide_drive_t *drive = dev->driver_data;
+	ide_drive_t *drive = dev_get_drvdata(dev);
 	struct request rq;
 	struct request_pm_state rqpm;
 	ide_task_t args;
@@ -1235,7 +1235,7 @@ static int generic_ide_suspend(struct de
 
 static int generic_ide_resume(struct device *dev)
 {
-	ide_drive_t *drive = dev->driver_data;
+	ide_drive_t *drive = dev_get_drvdata(dev);
 	struct request rq;
 	struct request_pm_state rqpm;
 	ide_task_t args;
diff -Narup a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c
--- a/drivers/scsi/aha1740.c	2005-12-02 15:05:35.000000000 +0100
+++ b/drivers/scsi/aha1740.c	2005-12-02 15:06:48.000000000 +0100
@@ -659,7 +659,7 @@ static int aha1740_probe (struct device 
 
 static __devexit int aha1740_remove (struct device *dev)
 {
-	struct Scsi_Host *shpnt = dev->driver_data;
+	struct Scsi_Host *shpnt = dev_get_drvdata(dev);
 	struct aha1740_hostdata *host = HOSTDATA (shpnt);
 
 	scsi_remove_host(shpnt);
diff -Narup a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
--- a/drivers/usb/core/usb.c	2005-12-02 14:26:11.000000000 +0100
+++ b/drivers/usb/core/usb.c	2005-12-02 14:30:14.000000000 +0100
@@ -574,7 +574,7 @@ static int usb_hotplug (struct device *d
 
 	/* Must check driver_data here, as on remove driver is always NULL */
 	if ((dev->driver == &usb_generic_driver) || 
-	    (dev->driver_data == &usb_generic_driver_data))
+	    (dev_get_drvdata(dev) == &usb_generic_driver_data))
 		return 0;
 
 	intf = to_usb_interface(dev);
@@ -1414,7 +1414,7 @@ static int usb_generic_suspend(struct de
 	}
 
 	if ((dev->driver == NULL) ||
-	    (dev->driver_data == &usb_generic_driver_data))
+	    (dev_get_drvdata(dev) == &usb_generic_driver_data))
 		return 0;
 
 	intf = to_usb_interface(dev);
@@ -1460,7 +1460,7 @@ static int usb_generic_resume(struct dev
 	}
 
 	if ((dev->driver == NULL) ||
-	    (dev->driver_data == &usb_generic_driver_data))
+	    (dev_get_drvdata(dev) == &usb_generic_driver_data))
 		return 0;
 
 	intf = to_usb_interface(dev);



      parent reply	other threads:[~2005-12-05  5:53 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-12-05  5:47 [PATCH 0/3] Replace driver_data with dev_[gs]et_drvdata() Richard Knutsson
2005-12-05  5:47 ` [PATCH 1/3] net: Replace driver_data with dev_[gs]et_drvdata Richard Knutsson
2005-12-05  5:47 ` [PATCH 2/3] s390: " Richard Knutsson
2005-12-05  5:58 ` Richard Knutsson [this message]

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=4393D6F8.1080303@student.ltu.se \
    --to=ricknu-0@student.ltu.se \
    --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