aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-probe.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:58 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:58 -0400
commit552d3a99bdce8a0d7f9abe3766fb3655ef5757dc (patch)
tree4abf3d83da9348d30d9a9a9d60f9751bb7d875c6 /drivers/ide/ide-probe.c
parent4cda15a0995f2da5727514f84ec26d8b7420e1f9 (diff)
ide: remove broken EXABYTENEST support
do_identify() marks EXABYTENEST device as non-present and frees drive->id so enable_nest() has absolutely no chance of working. The code was like this since at least 2.6.12-rc2 and nobody has noticed so just remove broken EXABYTENEST support. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r--drivers/ide/ide-probe.c37
1 files changed, 0 insertions, 37 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 5e0c3fb3b43a..29649d09dbb8 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -465,37 +465,6 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
465 return rc; 465 return rc;
466} 466}
467 467
468/*
469 *
470 */
471static void enable_nest (ide_drive_t *drive)
472{
473 ide_hwif_t *hwif = drive->hwif;
474 const struct ide_tp_ops *tp_ops = hwif->tp_ops;
475 u8 stat;
476
477 printk(KERN_INFO "%s: enabling %s -- ",
478 hwif->name, (char *)&drive->id[ATA_ID_PROD]);
479
480 SELECT_DRIVE(drive);
481 msleep(50);
482 tp_ops->exec_command(hwif, ATA_EXABYTE_ENABLE_NEST);
483
484 if (ide_busy_sleep(hwif, WAIT_WORSTCASE, 0)) {
485 printk(KERN_CONT "failed (timeout)\n");
486 return;
487 }
488
489 msleep(50);
490
491 stat = tp_ops->read_status(hwif);
492
493 if (!OK_STAT(stat, 0, BAD_STAT))
494 printk(KERN_CONT "failed (status = 0x%02x)\n", stat);
495 else
496 printk(KERN_CONT "success\n");
497}
498
499/** 468/**
500 * probe_for_drives - upper level drive probe 469 * probe_for_drives - upper level drive probe
501 * @drive: drive to probe for 470 * @drive: drive to probe for
@@ -534,7 +503,6 @@ static u8 probe_for_drive(ide_drive_t *drive)
534 503
535 /* skip probing? */ 504 /* skip probing? */
536 if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0) { 505 if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0) {
537retry:
538 /* if !(success||timed-out) */ 506 /* if !(success||timed-out) */
539 if (do_probe(drive, ATA_CMD_ID_ATA) >= 2) 507 if (do_probe(drive, ATA_CMD_ID_ATA) >= 2)
540 /* look for ATAPI device */ 508 /* look for ATAPI device */
@@ -544,11 +512,6 @@ retry:
544 /* drive not found */ 512 /* drive not found */
545 return 0; 513 return 0;
546 514
547 if (strstr(m, "E X A B Y T E N E S T")) {
548 enable_nest(drive);
549 goto retry;
550 }
551
552 /* identification failed? */ 515 /* identification failed? */
553 if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) { 516 if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
554 if (drive->media == ide_disk) { 517 if (drive->media == ide_disk) {