diff options
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index f371b0de314f..79e0af3fd158 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -535,7 +535,7 @@ static int ide_register_port(ide_hwif_t *hwif) | |||
535 | 535 | ||
536 | /* register with global device tree */ | 536 | /* register with global device tree */ |
537 | dev_set_name(&hwif->gendev, hwif->name); | 537 | dev_set_name(&hwif->gendev, hwif->name); |
538 | hwif->gendev.driver_data = hwif; | 538 | dev_set_drvdata(&hwif->gendev, hwif); |
539 | if (hwif->gendev.parent == NULL) | 539 | if (hwif->gendev.parent == NULL) |
540 | hwif->gendev.parent = hwif->dev; | 540 | hwif->gendev.parent = hwif->dev; |
541 | hwif->gendev.release = hwif_release_dev; | 541 | hwif->gendev.release = hwif_release_dev; |
@@ -987,9 +987,9 @@ static void hwif_register_devices(ide_hwif_t *hwif) | |||
987 | int ret; | 987 | int ret; |
988 | 988 | ||
989 | dev_set_name(dev, "%u.%u", hwif->index, i); | 989 | dev_set_name(dev, "%u.%u", hwif->index, i); |
990 | dev_set_drvdata(dev, drive); | ||
990 | dev->parent = &hwif->gendev; | 991 | dev->parent = &hwif->gendev; |
991 | dev->bus = &ide_bus_type; | 992 | dev->bus = &ide_bus_type; |
992 | dev->driver_data = drive; | ||
993 | dev->release = drive_release_dev; | 993 | dev->release = drive_release_dev; |
994 | 994 | ||
995 | ret = device_register(dev); | 995 | ret = device_register(dev); |