From: Andrew Morton Cc: Jens Axboe Signed-off-by: Andrew Morton --- drivers/scsi/libata-scsi.c | 24 +----------------------- 1 files changed, 1 insertion(+), 23 deletions(-) diff -puN drivers/scsi/libata-scsi.c~git-block-revert-stuff drivers/scsi/libata-scsi.c --- devel/drivers/scsi/libata-scsi.c~git-block-revert-stuff 2006-01-28 15:13:49.000000000 -0800 +++ devel-akpm/drivers/scsi/libata-scsi.c 2006-01-28 15:13:49.000000000 -0800 @@ -1700,28 +1700,6 @@ static unsigned int ata_msense_rw_recove return sizeof(def_rw_recovery_mpage); } -/* - * We can turn this into a real blacklist if it's needed, for now just - * blacklist any Maxtor BANC1G10 revision firmware - */ -static int ata_dev_supports_fua(u16 *id) -{ - unsigned char model[41], fw[9]; - - if (!ata_id_has_fua(id)) - return 0; - - ata_dev_id_string(id, model, ATA_ID_PROD_OFS, sizeof(model)); - ata_dev_id_string(id, fw, ATA_ID_FW_REV_OFS, sizeof(fw)); - - if (strncmp(model, "Maxtor", 6)) - return 1; - if (strncmp(fw, "BANC1G10", 8)) - return 1; - - return 0; /* blacklisted */ -} - /** * ata_scsiop_mode_sense - Simulate MODE SENSE 6, 10 commands * @args: device IDENTIFY data / SCSI command of interest. @@ -1819,7 +1797,7 @@ unsigned int ata_scsiop_mode_sense(struc return 0; dpofua = 0; - if (ata_dev_supports_fua(args->id) && dev->flags & ATA_DFLAG_LBA48 && + if (ata_id_has_fua(args->id) && dev->flags & ATA_DFLAG_LBA48 && (!(dev->flags & ATA_DFLAG_PIO) || dev->multi_count)) dpofua = 1 << 4; _