Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6a45a0b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: move drive_is_ready() to ide-io.c 



Move drive_is_ready() to ide-io.c, then make it static.

Also make some minor CodingStyle fixups while at it.

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

drivers/ide/ide-io.c

+23 −0
Original line number Diff line number Diff line
@@ -887,6 +887,29 @@ static void ide_plug_device(ide_drive_t *drive) 
	spin_unlock_irqrestore(q->queue_lock, flags);

}



static int drive_is_ready(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	u8 stat = 0;



	if (drive->waiting_for_dma)

		return hwif->dma_ops->dma_test_irq(drive);



	if (hwif->io_ports.ctl_addr &&

	    (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0)

		stat = hwif->tp_ops->read_altstatus(hwif);

	else

		/* Note: this may clear a pending IRQ!! */

		stat = hwif->tp_ops->read_status(hwif);



	if (stat & ATA_BUSY)

		/* drive busy: definitely not interrupting */

		return 0;



	/* drive ready: *might* be interrupting */

	return 1;

}



/**

 *	ide_timer_expiry	-	handle lack of an IDE interrupt

 *	@data: timer callback magic (hwif)

drivers/ide/ide-iops.c

+0 −25
Original line number Diff line number Diff line
@@ -438,31 +438,6 @@ void ide_fixstring (u8 *s, const int bytecount, const int byteswap) 


EXPORT_SYMBOL(ide_fixstring);



int drive_is_ready (ide_drive_t *drive)

{

	ide_hwif_t *hwif	= drive->hwif;

	u8 stat			= 0;



	if (drive->waiting_for_dma)

		return hwif->dma_ops->dma_test_irq(drive);



	if (hwif->io_ports.ctl_addr &&

	    (hwif->host_flags & IDE_HFLAG_BROKEN_ALTSTATUS) == 0)

		stat = hwif->tp_ops->read_altstatus(hwif);

	else

		/* Note: this may clear a pending IRQ!! */

		stat = hwif->tp_ops->read_status(hwif);



	if (stat & ATA_BUSY)

		/* drive busy:  definitely not interrupting */

		return 0;



	/* drive ready: *might* be interrupting */

	return 1;

}



EXPORT_SYMBOL(drive_is_ready);



/*

 * This routine busy-waits for the drive status to be not "busy".

 * It then checks the status for all of the "good" bits and none

include/linux/ide.h

+0 −2
Original line number Diff line number Diff line
@@ -1200,8 +1200,6 @@ void SELECT_MASK(ide_drive_t *, int); 
u8 ide_read_error(ide_drive_t *);

void ide_read_bcount_and_ireason(ide_drive_t *, u16 *, u8 *);



extern int drive_is_ready(ide_drive_t *);



int ide_check_atapi_device(ide_drive_t *, const char *);



void ide_init_pc(struct ide_atapi_pc *);