Commit fcb5207723919ad85178420633d55efea80b652d
1 parent
d961450da5
Exists in
master
and in
39 other branches
ide: remove driver_data direct access of struct device
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. Cc: linux-ide@vger.kernel.org Acked-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 3 changed files with 7 additions and 5 deletions Side-by-side Diff
drivers/ide/ide-pm.c
| ... | ... | @@ -3,7 +3,8 @@ |
| 3 | 3 | |
| 4 | 4 | int generic_ide_suspend(struct device *dev, pm_message_t mesg) |
| 5 | 5 | { |
| 6 | - ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive); | |
| 6 | + ide_drive_t *drive = dev_get_drvdata(dev); | |
| 7 | + ide_drive_t *pair = ide_get_pair_dev(drive); | |
| 7 | 8 | ide_hwif_t *hwif = drive->hwif; |
| 8 | 9 | struct request *rq; |
| 9 | 10 | struct request_pm_state rqpm; |
| ... | ... | @@ -34,7 +35,8 @@ |
| 34 | 35 | |
| 35 | 36 | int generic_ide_resume(struct device *dev) |
| 36 | 37 | { |
| 37 | - ide_drive_t *drive = dev->driver_data, *pair = ide_get_pair_dev(drive); | |
| 38 | + ide_drive_t *drive = dev_get_drvdata(dev); | |
| 39 | + ide_drive_t *pair = ide_get_pair_dev(drive); | |
| 38 | 40 | ide_hwif_t *hwif = drive->hwif; |
| 39 | 41 | struct request *rq; |
| 40 | 42 | struct request_pm_state rqpm; |
drivers/ide/ide-probe.c
| ... | ... | @@ -535,7 +535,7 @@ |
| 535 | 535 | |
| 536 | 536 | /* register with global device tree */ |
| 537 | 537 | dev_set_name(&hwif->gendev, hwif->name); |
| 538 | - hwif->gendev.driver_data = hwif; | |
| 538 | + dev_set_drvdata(&hwif->gendev, hwif); | |
| 539 | 539 | if (hwif->gendev.parent == NULL) |
| 540 | 540 | hwif->gendev.parent = hwif->dev; |
| 541 | 541 | hwif->gendev.release = hwif_release_dev; |
| 542 | 542 | |
| ... | ... | @@ -987,9 +987,9 @@ |
| 987 | 987 | int ret; |
| 988 | 988 | |
| 989 | 989 | dev_set_name(dev, "%u.%u", hwif->index, i); |
| 990 | + dev_set_drvdata(dev, drive); | |
| 990 | 991 | dev->parent = &hwif->gendev; |
| 991 | 992 | dev->bus = &ide_bus_type; |
| 992 | - dev->driver_data = drive; | |
| 993 | 993 | dev->release = drive_release_dev; |
| 994 | 994 | |
| 995 | 995 | ret = device_register(dev); |
drivers/ide/ide_platform.c