ide: remove driver_data direct access of struct device
PATCH 1/1 ide: remove driver_data direct access of struct device
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the driver_data pointer in struct device. Instead, the functions dev_get_drvdata() and dev_set_drvdata() should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.
--- drivers/ide/ide-pm.c | 6 ++++-- drivers/ide/ide-probe.c | 4 ++-- drivers/ide/ide_platform.c | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-)
drivers/ide/ide_platform.c +1 -1
@@ -113,7 +113,7 @@ out: 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);
drivers/ide/ide-pm.c +4 -2
@@ -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;
@@ -37,7 +38,8 @@ int generic_ide_suspend(struct device *dint 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;
drivers/ide/ide-probe.c +2 -2
@@ -550,7 +550,7 @@ static int ide_register_port(ide_hwif_t/* 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;
@@ -999,9 +999,9 @@ static void hwif_register_devices(ide_hwint 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);
Quoted 11 lines · On Friday 01 May 2009 00:15:00 Greg Kroah-Hartman wrote:
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the
driver_datapointer in struct device. Instead, the functionsdev_get_drvdata()anddev_set_drvdata()should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.Cc Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 9 lines · Bartlomiej Zolnierkiewicz
Quoted 8 lines · On Friday 01 May 2009 00:15:00 Greg Kroah-Hartman wrote:
From: Greg Kroah-Hartman <[email protected]>
In the near future, the driver core is going to not allow direct access to the
driver_datapointer in struct device. Instead, the functionsdev_get_drvdata()anddev_set_drvdata()should be used. These functions have been around since the beginning, so are backwards compatible with all older kernel versions.
Quoted 5 lines
Quoted 3 lines
Cc Bartlomiej Zolnierkiewicz <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Thanks, I've updated my copy of the patch.
greg k-h