Commit 2ad1e558 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: convert ide_hwif_t.mmio into flag (v2) 



All users of ->mmio == 1 are gone so convert ->mmio into flag.

Noticed by Alan Cox.

v2:
* updated for scc_pata

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

drivers/ide/arm/icside.c

+1 −1
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e 
		 * Ensure we're using MMIO

		 */

		default_hwif_mmiops(hwif);

		hwif->mmio = 2;

		hwif->mmio = 1;



		for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

			hwif->hw.io_ports[i] = port;

drivers/ide/arm/rapide.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ rapide_locate_hwif(void __iomem *base, void __iomem *ctrl, unsigned int sz, int 
	hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;

	hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;

	hwif->hw.irq = hwif->irq = irq;

	hwif->mmio = 2;

	hwif->mmio = 1;

	default_hwif_mmiops(hwif);



	return hwif;

drivers/ide/cris/ide-cris.c

+1 −1
Original line number Diff line number Diff line
@@ -795,7 +795,7 @@ init_e100_ide (void) 
		                0, 0, cris_ide_ack_intr,

		                ide_default_irq(0));

		ide_register_hw(&hw, &hwif);

		hwif->mmio = 2;

		hwif->mmio = 1;

		hwif->chipset = ide_etrax100;

		hwif->tuneproc = &tune_cris_ide;

		hwif->speedproc = &speed_cris_ide;

drivers/ide/h8300/ide-h8300.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ static inline void hwif_setup(ide_hwif_t *hwif) 
{

	default_hwif_iops(hwif);



	hwif->mmio  = 2;

	hwif->mmio  = 1;

	hwif->OUTW  = mm_outw;

	hwif->OUTSW = mm_outsw;

	hwif->INW   = mm_inw;

drivers/ide/ide-dma.c

+4 −4
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ int ide_dma_setup(ide_drive_t *drive) 
	}



	/* PRD table */

	if (hwif->mmio == 2)

	if (hwif->mmio)

		writel(hwif->dmatable_dma, (void __iomem *)hwif->dma_prdtable);

	else

		outl(hwif->dmatable_dma, hwif->dma_prdtable);
@@ -815,7 +815,7 @@ int ide_release_dma(ide_hwif_t *hwif) 
{

	ide_release_dma_engine(hwif);



	if (hwif->mmio == 2)

	if (hwif->mmio)

		return 1;

	else

		return ide_release_iomio_dma(hwif);
@@ -884,9 +884,9 @@ static int ide_iomio_dma(ide_hwif_t *hwif, unsigned long base, unsigned int port 


static int ide_dma_iobase(ide_hwif_t *hwif, unsigned long base, unsigned int ports)

{

	if (hwif->mmio == 2)

	if (hwif->mmio)

		return ide_mapped_mmio_dma(hwif, base,ports);

	BUG_ON(hwif->mmio == 1);



	return ide_iomio_dma(hwif, base, ports);

}