Commit 5317464d authored by Borislav Petkov's avatar Borislav Petkov Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: remove the last ide-scsi remnants 



Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 5d655a03

drivers/ide/ide-atapi.c

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 


static inline int dev_is_idecd(ide_drive_t *drive)

{

	return (drive->media == ide_cdrom || drive->media == ide_optical) &&

		!(drive->dev_flags & IDE_DFLAG_SCSI);

	return drive->media == ide_cdrom || drive->media == ide_optical;

}



/*

drivers/ide/ide-io.c

+0 −3
Original line number Diff line number Diff line
@@ -426,9 +426,6 @@ void ide_map_sg(ide_drive_t *drive, struct request *rq) 
	ide_hwif_t *hwif = drive->hwif;

	struct scatterlist *sg = hwif->sg_table;



	if (hwif->sg_mapped)	/* needed by ide-scsi */

		return;



	if (rq->cmd_type != REQ_TYPE_ATA_TASKFILE) {

		hwif->sg_nents = blk_rq_map_sg(drive->queue, rq, sg);

	} else {

drivers/ide/ide-ioctls.c

+1 −2
Original line number Diff line number Diff line
@@ -95,8 +95,7 @@ static int ide_set_nice_ioctl(ide_drive_t *drive, unsigned long arg) 
		return -EPERM;



	if (((arg >> IDE_NICE_DSC_OVERLAP) & 1) &&

	    (drive->media != ide_tape ||

	     (drive->dev_flags & IDE_DFLAG_SCSI)))

	    (drive->media != ide_tape))

		return -EPERM;



	if ((arg >> IDE_NICE_DSC_OVERLAP) & 1)

drivers/ide/ide-probe.c

+0 −2
Original line number Diff line number Diff line
@@ -1141,8 +1141,6 @@ static struct kobject *ata_probe(dev_t dev, int *part, void *data) 


	if (drive->media == ide_disk)

		request_module("ide-disk");

	if (drive->dev_flags & IDE_DFLAG_SCSI)

		request_module("ide-scsi");

	if (drive->media == ide_cdrom || drive->media == ide_optical)

		request_module("ide-cd");

	if (drive->media == ide_tape)

include/linux/ide.h

+13 −15
Original line number Diff line number Diff line
@@ -559,28 +559,26 @@ enum { 
	IDE_DFLAG_NODMA			= (1 << 16),

	/* powermanagment told us not to do anything, so sleep nicely */

	IDE_DFLAG_BLOCKED		= (1 << 17),

	/* ide-scsi emulation */

	IDE_DFLAG_SCSI			= (1 << 18),

	/* sleeping & sleep field valid */

	IDE_DFLAG_SLEEPING		= (1 << 19),

	IDE_DFLAG_POST_RESET		= (1 << 20),

	IDE_DFLAG_UDMA33_WARNED		= (1 << 21),

	IDE_DFLAG_LBA48			= (1 << 22),

	IDE_DFLAG_SLEEPING		= (1 << 18),

	IDE_DFLAG_POST_RESET		= (1 << 19),

	IDE_DFLAG_UDMA33_WARNED		= (1 << 20),

	IDE_DFLAG_LBA48			= (1 << 21),

	/* status of write cache */

	IDE_DFLAG_WCACHE		= (1 << 23),

	IDE_DFLAG_WCACHE		= (1 << 22),

	/* used for ignoring ATA_DF */

	IDE_DFLAG_NOWERR		= (1 << 24),

	IDE_DFLAG_NOWERR		= (1 << 23),

	/* retrying in PIO */

	IDE_DFLAG_DMA_PIO_RETRY		= (1 << 25),

	IDE_DFLAG_LBA			= (1 << 26),

	IDE_DFLAG_DMA_PIO_RETRY		= (1 << 24),

	IDE_DFLAG_LBA			= (1 << 25),

	/* don't unload heads */

	IDE_DFLAG_NO_UNLOAD		= (1 << 27),

	IDE_DFLAG_NO_UNLOAD		= (1 << 26),

	/* heads unloaded, please don't reset port */

	IDE_DFLAG_PARKED		= (1 << 28),

	IDE_DFLAG_MEDIA_CHANGED		= (1 << 29),

	IDE_DFLAG_PARKED		= (1 << 27),

	IDE_DFLAG_MEDIA_CHANGED		= (1 << 28),

	/* write protect */

	IDE_DFLAG_WP			= (1 << 30),

	IDE_DFLAG_FORMAT_IN_PROGRESS	= (1 << 31),

	IDE_DFLAG_WP			= (1 << 29),

	IDE_DFLAG_FORMAT_IN_PROGRESS	= (1 << 30),

};



struct ide_drive_s {