diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:27 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:27 -0400 |
commit | 0a6e49e9bc1e9698b2a1a529776b928768561a5a (patch) | |
tree | 9f95af7057c7b3d1c34564d072866a2230db0557 /drivers/ide/ide-probe.c | |
parent | 255115fb35f80735c21a1cbe9809e9795a3af26e (diff) |
ide: remove now superfluous check from ide_host_register()
There should be no functional changes caused by this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index f3a56595eb75..75b79cc96339 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1362,20 +1362,15 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d, | |||
1362 | ide_init_port_hw(hwif, hws[i]); | 1362 | ide_init_port_hw(hwif, hws[i]); |
1363 | ide_port_apply_params(hwif); | 1363 | ide_port_apply_params(hwif); |
1364 | 1364 | ||
1365 | if (d == NULL) { | 1365 | if ((i & 1) && mate) { |
1366 | mate = NULL; | 1366 | hwif->mate = mate; |
1367 | } else { | 1367 | mate->mate = hwif; |
1368 | if ((i & 1) && mate) { | ||
1369 | hwif->mate = mate; | ||
1370 | mate->mate = hwif; | ||
1371 | } | ||
1372 | |||
1373 | mate = (i & 1) ? NULL : hwif; | ||
1374 | |||
1375 | ide_init_port(hwif, i & 1, d); | ||
1376 | ide_port_cable_detect(hwif); | ||
1377 | } | 1368 | } |
1378 | 1369 | ||
1370 | mate = (i & 1) ? NULL : hwif; | ||
1371 | |||
1372 | ide_init_port(hwif, i & 1, d); | ||
1373 | ide_port_cable_detect(hwif); | ||
1379 | ide_port_init_devices(hwif); | 1374 | ide_port_init_devices(hwif); |
1380 | } | 1375 | } |
1381 | 1376 | ||