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

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

ide: remove superfluous ->dma field from ide_hwif_t 



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

drivers/ide/ide-dma.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -525,7 +525,6 @@ void ide_dma_start(ide_drive_t *drive) 
		outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD);

		outb(dma_cmd | 1, hwif->dma_base + ATA_DMA_CMD);

	}

	}





	hwif->dma = 1;

	wmb();

	wmb();

}

}
@@ -564,7 +563,6 @@ int __ide_dma_end (ide_drive_t *drive) 
	/* purge DMA mappings */

	/* purge DMA mappings */

	ide_destroy_dmatable(drive);

	ide_destroy_dmatable(drive);

	/* verify good DMA status */

	/* verify good DMA status */

	hwif->dma = 0;

	wmb();

	wmb();

	return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;

	return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;

}

}

drivers/ide/pci/scc_pata.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -353,7 +353,6 @@ static void scc_dma_start(ide_drive_t *drive) 




	/* start DMA */

	/* start DMA */

	scc_ide_outb(dma_cmd | 1, hwif->dma_base);

	scc_ide_outb(dma_cmd | 1, hwif->dma_base);

	hwif->dma = 1;

	wmb();

	wmb();

}

}
@@ -374,7 +373,6 @@ static int __scc_dma_end(ide_drive_t *drive) 
	/* purge DMA mappings */

	/* purge DMA mappings */

	ide_destroy_dmatable(drive);

	ide_destroy_dmatable(drive);

	/* verify good DMA status */

	/* verify good DMA status */

	hwif->dma = 0;

	wmb();

	wmb();

	return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;

	return (dma_stat & 7) != 4 ? (0x10 | dma_stat) : 0;

}

}

include/linux/ide.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -756,8 +756,6 @@ typedef struct hwif_s { 




	void		*hwif_data;	/* extra hwif data */

	void		*hwif_data;	/* extra hwif data */





	unsigned dma;



#ifdef CONFIG_BLK_DEV_IDEACPI

#ifdef CONFIG_BLK_DEV_IDEACPI

	struct ide_acpi_hwif_link *acpidata;

	struct ide_acpi_hwif_link *acpidata;

#endif

#endif