[PATCH] Remove long dead i386 floppy asm code

From: Brian Gerst
Date: Sat Mar 25 2006 - 09:27:47 EST


It's been disabled since v2.1.88

Signed-off-by: Brian Gerst <bgerst@xxxxxxxxxxxxx>

---

include/asm-i386/floppy.h | 34 ----------------------------------
1 files changed, 0 insertions(+), 34 deletions(-)

78e3b62a949a66661fab4c548e5beb2b863ed87d
diff --git a/include/asm-i386/floppy.h b/include/asm-i386/floppy.h
index 79727af..0340304 100644
--- a/include/asm-i386/floppy.h
+++ b/include/asm-i386/floppy.h
@@ -56,7 +56,6 @@ static irqreturn_t floppy_hardint(int ir
register unsigned char st;

#undef TRACE_FLPY_INT
-#define NO_FLOPPY_ASSEMBLER

#ifdef TRACE_FLPY_INT
static int calls=0;
@@ -71,38 +70,6 @@ static irqreturn_t floppy_hardint(int ir
bytes = virtual_dma_count;
#endif

-#ifndef NO_FLOPPY_ASSEMBLER
- __asm__ (
- "testl %1,%1"
- "je 3f"
-"1: inb %w4,%b0"
- "andb $160,%b0"
- "cmpb $160,%b0"
- "jne 2f"
- "incw %w4"
- "testl %3,%3"
- "jne 4f"
- "inb %w4,%b0"
- "movb %0,(%2)"
- "jmp 5f"
-"4: movb (%2),%0"
- "outb %b0,%w4"
-"5: decw %w4"
- "outb %0,$0x80"
- "decl %1"
- "incl %2"
- "testl %1,%1"
- "jne 1b"
-"3: inb %w4,%b0"
-"2: "
- : "=a" ((char) st),
- "=c" ((long) virtual_dma_count),
- "=S" ((long) virtual_dma_addr)
- : "b" ((long) virtual_dma_mode),
- "d" ((short) virtual_dma_port+4),
- "1" ((long) virtual_dma_count),
- "2" ((long) virtual_dma_addr));
-#else
{
register int lcount;
register char *lptr;
@@ -122,7 +89,6 @@ static irqreturn_t floppy_hardint(int ir
virtual_dma_addr = lptr;
st = inb(virtual_dma_port+4);
}
-#endif

#ifdef TRACE_FLPY_INT
calls++;
--
1.2.4.g3103



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/