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

Commit 374e042c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add struct ide_tp_ops (take 2) 



* Add struct ide_tp_ops for transport methods.

* Add 'const struct ide_tp_ops *tp_ops' to struct ide_port_info
  and ide_hwif_t.

* Set the default hwif->tp_ops in ide_init_port_data().

* Set host driver specific hwif->tp_ops in ide_init_port().

* Export ide_exec_command(), ide_read_status(), ide_read_altstatus(),
  ide_read_sff_dma_status(), ide_set_irq(), ide_tf_{load,read}()
  and ata_{in,out}put_data().

* Convert host drivers and core code to use struct ide_tp_ops.

* Remove no longer needed default_hwif_transport().

* Cleanup ide_hwif_t from methods that are now in struct ide_tp_ops.

While at it:

* Use struct ide_port_info in falconide.c and q40ide.c.

* Rename ata_{in,out}put_data() to ide_{in,out}put_data().

v2:

* Fix missing convertion in ns87415.c.

There should be no functional changes caused by this patch.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d6276b5f

drivers/ide/arm/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static void icside_dma_timeout(ide_drive_t *drive) 
	if (icside_dma_test_irq(drive))

		return;



	ide_dump_status(drive, "DMA timeout", hwif->read_status(hwif));

	ide_dump_status(drive, "DMA timeout", hwif->tp_ops->read_status(hwif));



	icside_dma_end(drive);

}

drivers/ide/h8300/ide-h8300.c

+16 −10
Original line number Diff line number Diff line
@@ -155,6 +155,21 @@ static void h8300_output_data(ide_drive_t *drive, struct request *rq, 
	mm_outsw(drive->hwif->io_ports.data_addr, buf, (len + 1) / 2);

}



static const struct ide_tp_ops h8300_tp_ops = {

	.exec_command		= ide_exec_command,

	.read_status		= ide_read_status,

	.read_altstatus		= ide_read_altstatus,

	.read_sff_dma_status	= ide_read_sff_dma_status,



	.set_irq		= ide_set_irq,



	.tf_load		= h8300_tf_load,

	.tf_read		= h8300_tf_read,



	.input_data		= h8300_input_data,

	.output_data		= h8300_output_data,

};



#define H8300_IDE_GAP (2)



static inline void hw_setup(hw_regs_t *hw)
@@ -169,16 +184,8 @@ static inline void hw_setup(hw_regs_t *hw) 
	hw->chipset = ide_generic;

}



static inline void hwif_setup(ide_hwif_t *hwif)

{

	hwif->tf_load = h8300_tf_load;

	hwif->tf_read = h8300_tf_read;



	hwif->input_data  = h8300_input_data;

	hwif->output_data = h8300_output_data;

}



static const struct ide_port_info h8300_port_info = {

	.tp_ops			= &h8300_tp_ops,

	.host_flags		= IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_NO_DMA,

};
@@ -205,7 +212,6 @@ static int __init h8300_ide_init(void) 
		return -ENOENT;



	index = hwif->index;

	hwif_setup(hwif);



	idx[0] = index;

drivers/ide/ide-atapi.c

+7 −6
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, 
	void (*io_buffers)(ide_drive_t *, struct ide_atapi_pc *, unsigned, int))

{

	ide_hwif_t *hwif = drive->hwif;

	const struct ide_tp_ops *tp_ops = hwif->tp_ops;

	xfer_func_t *xferfunc;

	unsigned int temp;

	u16 bcount;
@@ -35,7 +36,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, 
	}



	/* Clear the interrupt */

	stat = hwif->read_status(hwif);

	stat = tp_ops->read_status(hwif);



	if (pc->flags & PC_FLAG_DMA_IN_PROGRESS) {

		if (hwif->dma_ops->dma_end(drive) ||
@@ -140,7 +141,7 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, 
					if (pc->sg)

						io_buffers(drive, pc, temp, 0);

					else

						hwif->input_data(drive, NULL,

						tp_ops->input_data(drive, NULL,

							pc->cur_pos, temp);

					printk(KERN_ERR "%s: transferred %d of "

							"%d bytes\n",
@@ -157,9 +158,9 @@ ide_startstop_t ide_pc_intr(ide_drive_t *drive, struct ide_atapi_pc *pc, 
			debug_log("The device wants to send us more data than "

				  "expected - allowing transfer\n");

		}

		xferfunc = hwif->input_data;

		xferfunc = tp_ops->input_data;

	} else

		xferfunc = hwif->output_data;

		xferfunc = tp_ops->output_data;



	if ((drive->media == ide_floppy && !scsi && !pc->buf) ||

	    (drive->media == ide_tape && !scsi && pc->bh) ||
@@ -188,7 +189,7 @@ static u8 ide_read_ireason(ide_drive_t *drive) 
	memset(&task, 0, sizeof(task));

	task.tf_flags = IDE_TFLAG_IN_NSECT;



	drive->hwif->tf_read(drive, &task);

	drive->hwif->tp_ops->tf_read(drive, &task);



	return task.tf.nsect & 3;

}
@@ -249,7 +250,7 @@ ide_startstop_t ide_transfer_pc(ide_drive_t *drive, struct ide_atapi_pc *pc, 


	/* Send the actual packet */

	if ((pc->flags & PC_FLAG_ZIP_DRIVE) == 0)

		hwif->output_data(drive, NULL, pc->c, 12);

		hwif->tp_ops->output_data(drive, NULL, pc->c, 12);



	return ide_started;

}

drivers/ide/ide-cd.c

+6 −6
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret) 
	int stat, err, sense_key;



	/* check for errors */

	stat = hwif->read_status(hwif);

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



	if (stat_ret)

		*stat_ret = stat;
@@ -590,7 +590,7 @@ static ide_startstop_t cdrom_transfer_packet_command(ide_drive_t *drive, 
		cmd_len = ATAPI_MIN_CDB_BYTES;



	/* send the command to the device */

	hwif->output_data(drive, NULL, rq->cmd, cmd_len);

	hwif->tp_ops->output_data(drive, NULL, rq->cmd, cmd_len);



	/* start the DMA if need be */

	if (info->dma)
@@ -627,7 +627,7 @@ static int ide_cd_check_ireason(ide_drive_t *drive, struct request *rq, 
		 * Some drives (ASUS) seem to tell us that status info is

		 * available.  Just get it and ignore.

		 */

		(void)hwif->read_status(hwif);

		(void)hwif->tp_ops->read_status(hwif);

		return 0;

	} else {

		/* drive wants a command packet, or invalid ireason... */
@@ -990,10 +990,10 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) 


	if (ireason == 0) {

		write = 1;

		xferfunc = hwif->output_data;

		xferfunc = hwif->tp_ops->output_data;

	} else {

		write = 0;

		xferfunc = hwif->input_data;

		xferfunc = hwif->tp_ops->input_data;

	}



	/* transfer data */
@@ -1200,7 +1200,7 @@ static ide_startstop_t ide_cd_do_request(ide_drive_t *drive, struct request *rq, 
		if (info->cd_flags & IDE_CD_FLAG_SEEKING) {

			ide_hwif_t *hwif = drive->hwif;

			unsigned long elapsed = jiffies - info->start_seek;

			int stat = hwif->read_status(hwif);

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



			if ((stat & SEEK_STAT) != SEEK_STAT) {

				if (elapsed < IDECD_SEEK_TIMEOUT) {

drivers/ide/ide-dma.c

+6 −6
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ ide_startstop_t ide_dma_intr (ide_drive_t *drive) 
	u8 stat = 0, dma_stat = 0;



	dma_stat = hwif->dma_ops->dma_end(drive);

	stat = hwif->read_status(hwif);

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



	if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) {

		if (!dma_stat) {
@@ -335,7 +335,7 @@ static int config_drive_for_dma (ide_drive_t *drive) 
static int dma_timer_expiry (ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 dma_stat		= hwif->read_sff_dma_status(hwif);

	u8 dma_stat		= hwif->tp_ops->read_sff_dma_status(hwif);



	printk(KERN_WARNING "%s: dma_timer_expiry: dma status == 0x%02x\n",

		drive->name, dma_stat);
@@ -370,7 +370,7 @@ void ide_dma_host_set(ide_drive_t *drive, int on) 
{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 unit			= (drive->select.b.unit & 0x01);

	u8 dma_stat		= hwif->read_sff_dma_status(hwif);

	u8 dma_stat		= hwif->tp_ops->read_sff_dma_status(hwif);



	if (on)

		dma_stat |= (1 << (5 + unit));
@@ -482,7 +482,7 @@ int ide_dma_setup(ide_drive_t *drive) 
		outb(reading, hwif->dma_base + ATA_DMA_CMD);



	/* read DMA status for INTR & ERROR flags */

	dma_stat = hwif->read_sff_dma_status(hwif);

	dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);



	/* clear INTR & ERROR flags */

	if (mmio)
@@ -551,7 +551,7 @@ int __ide_dma_end (ide_drive_t *drive) 
	}



	/* get DMA status */

	dma_stat = hwif->read_sff_dma_status(hwif);

	dma_stat = hwif->tp_ops->read_sff_dma_status(hwif);



	if (mmio)

		/* clear the INTR & ERROR bits */
@@ -574,7 +574,7 @@ EXPORT_SYMBOL(__ide_dma_end); 
int ide_dma_test_irq(ide_drive_t *drive)

{

	ide_hwif_t *hwif	= HWIF(drive);

	u8 dma_stat		= hwif->read_sff_dma_status(hwif);

	u8 dma_stat		= hwif->tp_ops->read_sff_dma_status(hwif);



	/* return 1 if INTR asserted */

	if ((dma_stat & 4) == 4)