Skip to content

Commit

Permalink
ide: factor out code for tuning devices from ide_probe_port()
Browse files Browse the repository at this point in the history
* Factor out code for tuning devices from ide_probe_port()
  to ide_port_tune_devices().

* Move ide_port_tune_devices() call from ide_probe_port()
  to ide_device_add_all().

There should be no functionality changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Feb 1, 2008
1 parent 139ddfc commit e84e7ea
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions drivers/ide/ide-probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -794,6 +794,13 @@ static int ide_probe_port(ide_hwif_t *hwif)
if (!hwif->present)
return -ENODEV;

return 0;
}

static void ide_port_tune_devices(ide_hwif_t *hwif)
{
int unit;

for (unit = 0; unit < MAX_DRIVES; unit++) {
ide_drive_t *drive = &hwif->drives[unit];

Expand Down Expand Up @@ -827,8 +834,6 @@ static int ide_probe_port(ide_hwif_t *hwif)
else
drive->no_io_32bit = drive->id->dword_io ? 1 : 0;
}

return 0;
}

#if MAX_HWIFS > 1
Expand Down Expand Up @@ -1309,8 +1314,12 @@ int ide_device_add_all(u8 *idx)
continue;
}

if (ide_probe_port(hwif) < 0)
if (ide_probe_port(hwif) < 0) {
ide_hwif_release_regions(hwif);
continue;
}

ide_port_tune_devices(hwif);
}

for (i = 0; i < MAX_HWIFS; i++) {
Expand Down

0 comments on commit e84e7ea

Please sign in to comment.