trm290: housekeeping

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Feb 7, 2011 libata

Share & tools

Bartlomiej Zolnierkiewicz

author

2011-02-07 10:57 UTC #0 lore raw

PATCH 1/1 trm290: housekeeping

* remove dead DMA support (it has been dead for a long, long time and despite stale comments in the driver it couldn't be enabled at runtime)
* remove needless ifdefs

Compile-tested only.

Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>

---
 drivers/ide/ide-dma-sff.c |    8 ---
 drivers/ide/trm290.c      |  108 
+---------------------------------------------
 include/linux/ide.h       |    2 
 3 files changed, 6 insertions(+), 112 deletions(-)

drivers/ide/ide-dma-sff.c +2 -6

Index: b/drivers/ide/ide-dma-sff.c
===================================================================
@@ -117,7 +117,6 @@ int ide_build_dmatable(ide_drive_t *driv
 	unsigned int count = 0;
 	int i;
 	struct scatterlist *sg;
-	u8 is_trm290 = !!(hwif->host_flags & IDE_HFLAG_TRM290);
 
 	for_each_sg(hwif->sg_table, sg, cmd->sg_nents, i) {
 		u32 cur_addr, cur_len, xcount, bcount;

@@ -140,9 +139,7 @@ int ide_build_dmatable(ide_drive_t *driv
 				bcount = cur_len;
 			*table++ = cpu_to_le32(cur_addr);
 			xcount = bcount & 0xffff;
-			if (is_trm290)
-				xcount = ((xcount >> 2) - 1) << 16;
-			else if (xcount == 0x0000) {
+			if (xcount == 0x0000) {
 				if (count++ >= PRD_ENTRIES)
 					goto use_pio_instead;
 				*table++ = cpu_to_le32(0x8000);

@@ -156,8 +153,7 @@ int ide_build_dmatable(ide_drive_t *driv
 	}
 
 	if (count) {
-		if (!is_trm290)
-			*--table |= cpu_to_le32(0x80000000);
+		*--table |= cpu_to_le32(0x80000000);
 		return count;
 	}

drivers/ide/trm290.c +4 ~~-104~~

153 lines not on this page · raw message

pci_device_id *id)

include/linux/ide.h +0 -2

Index: b/include/linux/ide.h
===================================================================
@@ -1260,8 +1260,6 @@ enum {
 	IDE_HFLAG_DTC2278		= (1 << 21),
 	/* 4 devices on a single set of I/O ports */
 	IDE_HFLAG_4DRIVES		= (1 << 22),
-	/* host is TRM290 */
-	IDE_HFLAG_TRM290		= (1 << 23),
 	/* use 32-bit I/O ops */
 	IDE_HFLAG_IO_32BIT		= (1 << 24),
 	/* unmask IRQs */