Messages in this thread Patch in this message | | | Date | Fri, 18 Nov 2005 23:21:03 +0100 | From | Bartlomiej Zolnierkiewicz <> | Subject | Re: [PATCH] update ide.c to use pci_get_drvdata() |
| |
[ akpm and linus removed from cc: ]
On 11/16/05, Kasper Sandberg <lkml@metanurb.dk> wrote: > This updates drivers/ide/ide.c to use pci_get_drvdata() instead of > accessing driver_data directly. > > Signed-off-by: Kasper Sandberg <lkml@metanurb.dk>
diff -Naur linux-2.6.15-rc1-git4-a/drivers/ide/ide.c linux-2.6.15-rc1-git4-b/drivers/ide/ide.c --- linux-2.6.15-rc1-git4-a/drivers/ide/ide.c 2005-11-16 22:50:43.700117269 +0100 +++ linux-2.6.15-rc1-git4-b/drivers/ide/ide.c 2005-11-16 23:00:43.891060658 +0100 @@ -1216,7 +1216,7 @@
static int generic_ide_suspend(struct device *dev, pm_message_t state) { - ide_drive_t *drive = dev->driver_data; + ide_drive_t *drive = pci_get_drvdata(dev);
dev is of "struct device *" type not "struct pci_dev *" so dev_get_drvdata() should be used instead
struct request rq; struct request_pm_state rqpm; ide_task_t args; @@ -1235,7 +1235,7 @@
static int generic_ide_resume(struct device *dev) { - ide_drive_t *drive = dev->driver_data; + ide_drive_t *drive = pci_get_drvdata(dev);
ditto
struct request rq; struct request_pm_state rqpm; ide_task_t args; Care to respin the patch?
[ Am I the only one reviewing IDE patches? It seems so... ]
Bartlomiej - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |