From 5fc4eb24af51552a2882bec42ac9923341333032 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 30 Apr 2009 14:43:31 -0700
Subject: [PATCH] --- yaml --- r: 151269 b: refs/heads/master c:
 fcb5207723919ad85178420633d55efea80b652d h: refs/heads/master i:   151267:
 500089d7318dc5c10077fcc4c0eeaf4e85f83042 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/ide/ide-pm.c       | 6 ++++--
 trunk/drivers/ide/ide-probe.c    | 4 ++--
 trunk/drivers/ide/ide_platform.c | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 0353bf95ee1c..da2a61e1b588 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d961450da5e16dae8da276c0a234764872b2307b
+refs/heads/master: fcb5207723919ad85178420633d55efea80b652d
diff --git a/trunk/drivers/ide/ide-pm.c b/trunk/drivers/ide/ide-pm.c
index ba1488bd8430..c14ca144cffe 100644
--- a/trunk/drivers/ide/ide-pm.c
+++ b/trunk/drivers/ide/ide-pm.c
@@ -3,7 +3,8 @@
 
 int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 {
-	ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive);
+	ide_drive_t *drive = dev_get_drvdata(dev);
+	ide_drive_t *pair = ide_get_pair_dev(drive);
 	ide_hwif_t *hwif = drive->hwif;
 	struct request *rq;
 	struct request_pm_state rqpm;
@@ -34,7 +35,8 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
 
 int generic_ide_resume(struct device *dev)
 {
-	ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive);
+	ide_drive_t *drive = dev_get_drvdata(dev);
+	ide_drive_t *pair = ide_get_pair_dev(drive);
 	ide_hwif_t *hwif = drive->hwif;
 	struct request *rq;
 	struct request_pm_state rqpm;
diff --git a/trunk/drivers/ide/ide-probe.c b/trunk/drivers/ide/ide-probe.c
index f371b0de314f..79e0af3fd158 100644
--- a/trunk/drivers/ide/ide-probe.c
+++ b/trunk/drivers/ide/ide-probe.c
@@ -535,7 +535,7 @@ static int ide_register_port(ide_hwif_t *hwif)
 
 	/* register with global device tree */
 	dev_set_name(&hwif->gendev, hwif->name);
-	hwif->gendev.driver_data = hwif;
+	dev_set_drvdata(&hwif->gendev, hwif);
 	if (hwif->gendev.parent == NULL)
 		hwif->gendev.parent = hwif->dev;
 	hwif->gendev.release = hwif_release_dev;
@@ -987,9 +987,9 @@ static void hwif_register_devices(ide_hwif_t *hwif)
 		int ret;
 
 		dev_set_name(dev, "%u.%u", hwif->index, i);
+		dev_set_drvdata(dev, drive);
 		dev->parent = &hwif->gendev;
 		dev->bus = &ide_bus_type;
-		dev->driver_data = drive;
 		dev->release = drive_release_dev;
 
 		ret = device_register(dev);
diff --git a/trunk/drivers/ide/ide_platform.c b/trunk/drivers/ide/ide_platform.c
index ee9b55ecc62b..b579fbe88370 100644
--- a/trunk/drivers/ide/ide_platform.c
+++ b/trunk/drivers/ide/ide_platform.c
@@ -112,7 +112,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
 
 static int __devexit plat_ide_remove(struct platform_device *pdev)
 {
-	struct ide_host *host = pdev->dev.driver_data;
+	struct ide_host *host = dev_get_drvdata(&pdev->dev);
 
 	ide_host_remove(host);