Commit 8e7657ae authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: remove atapi_ireason_t (take 3) 



Remove atapi_ireason_t.

While at it:
* replace 'HWIF(drive)' by 'drive->hwif' (or just 'hwif' where possible)

v2:
* v1 had CD and IO bits reversed in many places.

* Use CD and IO defines from <linux/hdreg.h>.

v3:
* Fix incorrect "(ireason & IO) == test_bit()". (Noticed by Sergei)

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 790d1239

drivers/ide/ide-floppy.c

+12 −13
Original line number Diff line number Diff line
@@ -788,12 +788,11 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) 
{

	idefloppy_floppy_t *floppy = drive->driver_data;

	ide_hwif_t *hwif = drive->hwif;

	atapi_ireason_t ireason;

	idefloppy_pc_t *pc = floppy->pc;

	struct request *rq = pc->rq;

	unsigned int temp;

	u16 bcount;

	u8 stat;

	u8 stat, ireason;



	debug_log(KERN_INFO "ide-floppy: Reached %s interrupt handler\n",

		__FUNCTION__);
@@ -852,18 +851,18 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) 
	bcount = (hwif->INB(IDE_BCOUNTH_REG) << 8) |

		  hwif->INB(IDE_BCOUNTL_REG);

	/* on this interrupt */

	ireason.all = HWIF(drive)->INB(IDE_IREASON_REG);

	ireason = hwif->INB(IDE_IREASON_REG);



	if (ireason.b.cod) {

	if (ireason & CD) {

		printk(KERN_ERR "ide-floppy: CoD != 0 in idefloppy_pc_intr\n");

		return ide_do_reset(drive);

	}

	if (ireason.b.io == test_bit(PC_WRITING, &pc->flags)) {

	if (((ireason & IO) == IO) == test_bit(PC_WRITING, &pc->flags)) {

		/* Hopefully, we will never get here */

		printk(KERN_ERR "ide-floppy: We wanted to %s, ",

			ireason.b.io ? "Write":"Read");

				(ireason & IO) ? "Write" : "Read");

		printk(KERN_ERR "but the floppy wants us to %s !\n",

			ireason.b.io ? "Read":"Write");

				(ireason & IO) ? "Read" : "Write");

		return ide_do_reset(drive);

	}

	if (!test_bit(PC_WRITING, &pc->flags)) {
@@ -920,15 +919,15 @@ static ide_startstop_t idefloppy_transfer_pc (ide_drive_t *drive) 
{

	ide_startstop_t startstop;

	idefloppy_floppy_t *floppy = drive->driver_data;

	atapi_ireason_t ireason;

	u8 ireason;



	if (ide_wait_stat(&startstop, drive, DRQ_STAT, BUSY_STAT, WAIT_READY)) {

		printk(KERN_ERR "ide-floppy: Strange, packet command "

				"initiated yet DRQ isn't asserted\n");

		return startstop;

	}

	ireason.all = HWIF(drive)->INB(IDE_IREASON_REG);

	if (!ireason.b.cod || ireason.b.io) {

	ireason = drive->hwif->INB(IDE_IREASON_REG);

	if ((ireason & CD) == 0 || (ireason & IO)) {

		printk(KERN_ERR "ide-floppy: (IO,CoD) != (0,1) while "

				"issuing a packet command\n");

		return ide_do_reset(drive);
@@ -968,15 +967,15 @@ static ide_startstop_t idefloppy_transfer_pc1 (ide_drive_t *drive) 
{

	idefloppy_floppy_t *floppy = drive->driver_data;

	ide_startstop_t startstop;

	atapi_ireason_t ireason;

	u8 ireason;



	if (ide_wait_stat(&startstop, drive, DRQ_STAT, BUSY_STAT, WAIT_READY)) {

		printk(KERN_ERR "ide-floppy: Strange, packet command "

				"initiated yet DRQ isn't asserted\n");

		return startstop;

	}

	ireason.all = HWIF(drive)->INB(IDE_IREASON_REG);

	if (!ireason.b.cod || ireason.b.io) {

	ireason = drive->hwif->INB(IDE_IREASON_REG);

	if ((ireason & CD) == 0 || (ireason & IO)) {

		printk(KERN_ERR "ide-floppy: (IO,CoD) != (0,1) "

				"while issuing a packet command\n");

		return ide_do_reset(drive);

drivers/ide/ide-tape.c

+13 −14
Original line number Diff line number Diff line
@@ -1847,14 +1847,13 @@ static ide_startstop_t idetape_pc_intr (ide_drive_t *drive) 
{

	ide_hwif_t *hwif = drive->hwif;

	idetape_tape_t *tape = drive->driver_data;

	atapi_ireason_t ireason;

	idetape_pc_t *pc = tape->pc;

	unsigned int temp;

#if SIMULATE_ERRORS

	static int error_sim_count = 0;

#endif

	u16 bcount;

	u8 stat;

	u8 stat, ireason;



#if IDETAPE_DEBUG_LOG

	if (tape->debug_level >= 4)
@@ -1965,18 +1964,18 @@ static ide_startstop_t idetape_pc_intr (ide_drive_t *drive) 
	bcount = (hwif->INB(IDE_BCOUNTH_REG) << 8) |

		  hwif->INB(IDE_BCOUNTL_REG);



	ireason.all = hwif->INB(IDE_IREASON_REG);

	ireason = hwif->INB(IDE_IREASON_REG);



	if (ireason.b.cod) {

	if (ireason & CD) {

		printk(KERN_ERR "ide-tape: CoD != 0 in idetape_pc_intr\n");

		return ide_do_reset(drive);

	}

	if (ireason.b.io == test_bit(PC_WRITING, &pc->flags)) {

	if (((ireason & IO) == IO) == test_bit(PC_WRITING, &pc->flags)) {

		/* Hopefully, we will never get here */

		printk(KERN_ERR "ide-tape: We wanted to %s, ",

			ireason.b.io ? "Write":"Read");

				(ireason & IO) ? "Write" : "Read");

		printk(KERN_ERR "ide-tape: but the tape wants us to %s !\n",

			ireason.b.io ? "Read":"Write");

				(ireason & IO) ? "Read" : "Write");

		return ide_do_reset(drive);

	}

	if (!test_bit(PC_WRITING, &pc->flags)) {
@@ -2070,28 +2069,28 @@ static ide_startstop_t idetape_transfer_pc(ide_drive_t *drive) 
	ide_hwif_t *hwif = drive->hwif;

	idetape_tape_t *tape = drive->driver_data;

	idetape_pc_t *pc = tape->pc;

	atapi_ireason_t ireason;

	int retries = 100;

	ide_startstop_t startstop;

	u8 ireason;



	if (ide_wait_stat(&startstop,drive,DRQ_STAT,BUSY_STAT,WAIT_READY)) {

		printk(KERN_ERR "ide-tape: Strange, packet command initiated yet DRQ isn't asserted\n");

		return startstop;

	}

	ireason.all = hwif->INB(IDE_IREASON_REG);

	while (retries-- && (!ireason.b.cod || ireason.b.io)) {

	ireason = hwif->INB(IDE_IREASON_REG);

	while (retries-- && ((ireason & CD) == 0 || (ireason & IO))) {

		printk(KERN_ERR "ide-tape: (IO,CoD != (0,1) while issuing "

				"a packet command, retrying\n");

		udelay(100);

		ireason.all = hwif->INB(IDE_IREASON_REG);

		ireason = hwif->INB(IDE_IREASON_REG);

		if (retries == 0) {

			printk(KERN_ERR "ide-tape: (IO,CoD != (0,1) while "

					"issuing a packet command, ignoring\n");

			ireason.b.cod = 1;

			ireason.b.io = 0;

			ireason |= CD;

			ireason &= ~IO;

		}

	}

	if (!ireason.b.cod || ireason.b.io) {

	if ((ireason & CD) == 0 || (ireason & IO)) {

		printk(KERN_ERR "ide-tape: (IO,CoD) != (0,1) while issuing "

				"a packet command\n");

		return ide_do_reset(drive);

drivers/scsi/ide-scsi.c

+8 −9
Original line number Diff line number Diff line
@@ -398,10 +398,9 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive) 
	ide_hwif_t *hwif = drive->hwif;

	idescsi_pc_t *pc = scsi->pc;

	struct request *rq = pc->rq;

	atapi_ireason_t ireason;

	unsigned int temp;

	u16 bcount;

	u8 stat;

	u8 stat, ireason;



#if IDESCSI_DEBUG_LOG

	printk (KERN_INFO "ide-scsi: Reached idescsi_pc_intr interrupt handler\n");
@@ -439,13 +438,13 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive) 
	}

	bcount = (hwif->INB(IDE_BCOUNTH_REG) << 8) |

		  hwif->INB(IDE_BCOUNTL_REG);

	ireason.all	= HWIF(drive)->INB(IDE_IREASON_REG);

	ireason = hwif->INB(IDE_IREASON_REG);



	if (ireason.b.cod) {

	if (ireason & CD) {

		printk(KERN_ERR "ide-scsi: CoD != 0 in idescsi_pc_intr\n");

		return ide_do_reset (drive);

	}

	if (ireason.b.io) {

	if (ireason & IO) {

		temp = pc->actually_transferred + bcount;

		if (temp > pc->request_transfer) {

			if (temp > pc->buffer_size) {
@@ -474,7 +473,7 @@ static ide_startstop_t idescsi_pc_intr (ide_drive_t *drive) 
#endif /* IDESCSI_DEBUG_LOG */

		}

	}

	if (ireason.b.io) {

	if (ireason & IO) {

		clear_bit(PC_WRITING, &pc->flags);

		if (pc->sg)

			idescsi_input_buffers(drive, pc, bcount);
@@ -503,16 +502,16 @@ static ide_startstop_t idescsi_transfer_pc(ide_drive_t *drive) 
	ide_hwif_t *hwif = drive->hwif;

	idescsi_scsi_t *scsi = drive_to_idescsi(drive);

	idescsi_pc_t *pc = scsi->pc;

	atapi_ireason_t ireason;

	ide_startstop_t startstop;

	u8 ireason;



	if (ide_wait_stat(&startstop,drive,DRQ_STAT,BUSY_STAT,WAIT_READY)) {

		printk(KERN_ERR "ide-scsi: Strange, packet command "

			"initiated yet DRQ isn't asserted\n");

		return startstop;

	}

	ireason.all	= HWIF(drive)->INB(IDE_IREASON_REG);

	if (!ireason.b.cod || ireason.b.io) {

	ireason = hwif->INB(IDE_IREASON_REG);

	if ((ireason & CD) == 0 || (ireason & IO)) {

		printk(KERN_ERR "ide-scsi: (IO,CoD) != (0,1) while "

				"issuing a packet command\n");

		return ide_do_reset (drive);

include/linux/ide.h

+0 −24
Original line number Diff line number Diff line
@@ -345,30 +345,6 @@ typedef union { 
	} b;

} select_t, ata_select_t;



/*

 * ATAPI Interrupt Reason Register.

 *

 * cod		: Information transferred is command (1) or data (0)

 * io		: The device requests us to read (1) or write (0)

 * reserved	: Reserved

 */

typedef union {

	unsigned all			:8;

	struct {

#if defined(__LITTLE_ENDIAN_BITFIELD)

		unsigned cod		:1;

		unsigned io		:1;

		unsigned reserved	:6;

#elif defined(__BIG_ENDIAN_BITFIELD)

		unsigned reserved	:6;

		unsigned io		:1;

		unsigned cod		:1;

#else

#error "Please fix <asm/byteorder.h>"

#endif

	} b;

} atapi_ireason_t;



/*

 * Status returned from various ide_ functions

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE