Skip to content

Commit 552d3a9

Browse files
committed
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>
1 parent 4cda15a commit 552d3a9

File tree

2 files changed

+0
-39
lines changed

2 files changed

+0
-39
lines changed

drivers/ide/ide-probe.c

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -465,37 +465,6 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
465465
return rc;
466466
}
467467

468-
/*
469-
*
470-
*/
471-
static 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-
499468
/**
500469
* probe_for_drives - upper level drive probe
501470
* @drive: drive to probe for
@@ -534,7 +503,6 @@ static u8 probe_for_drive(ide_drive_t *drive)
534503

535504
/* skip probing? */
536505
if ((drive->dev_flags & IDE_DFLAG_NOPROBE) == 0) {
537-
retry:
538506
/* if !(success||timed-out) */
539507
if (do_probe(drive, ATA_CMD_ID_ATA) >= 2)
540508
/* look for ATAPI device */
@@ -544,11 +512,6 @@ static u8 probe_for_drive(ide_drive_t *drive)
544512
/* drive not found */
545513
return 0;
546514

547-
if (strstr(m, "E X A B Y T E N E S T")) {
548-
enable_nest(drive);
549-
goto retry;
550-
}
551-
552515
/* identification failed? */
553516
if ((drive->dev_flags & IDE_DFLAG_ID_READ) == 0) {
554517
if (drive->media == ide_disk) {

include/linux/ata.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,6 @@ enum {
244244
ATA_CMD_MEDIA_UNLOCK = 0xDF,
245245
/* marked obsolete in the ATA/ATAPI-7 spec */
246246
ATA_CMD_RESTORE = 0x10,
247-
/* EXABYTE specific */
248-
ATA_EXABYTE_ENABLE_NEST = 0xF0,
249247

250248
/* READ_LOG_EXT pages */
251249
ATA_LOG_SATA_NCQ = 0x10,

0 commit comments

Comments
 (0)