From 4d2509bbc1602fb2924a013cef1b0bfdb3472453 Mon Sep 17 00:00:00 2001
From: Brian Gerst <bgerst@didntduck.org>
Date: Fri, 31 Mar 2006 02:30:04 -0800
Subject: [PATCH] --- yaml --- r: 24853 b: refs/heads/master c:
 3ccfb81e871b45e4af6ebb3282f3cfa0f98f1b80 h: refs/heads/master i:   24851:
 bf2b8aac8877fc8ca47711dca6afdc25cc79f1a9 v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-i386/floppy.h | 34 ---------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index d8ad6b953877..4d1f39f3518e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc83db4f006fcf9e9502a002b4bd448fc4511d04
+refs/heads/master: 3ccfb81e871b45e4af6ebb3282f3cfa0f98f1b80
diff --git a/trunk/include/asm-i386/floppy.h b/trunk/include/asm-i386/floppy.h
index 79727afb94c9..03403045c182 100644
--- a/trunk/include/asm-i386/floppy.h
+++ b/trunk/include/asm-i386/floppy.h
@@ -56,7 +56,6 @@ static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
 	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 irq, void *dev_id, struct pt_regs * regs)
 		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 irq, void *dev_id, struct pt_regs * regs)
 		virtual_dma_addr = lptr;
 		st = inb(virtual_dma_port+4);
 	}
-#endif
 
 #ifdef TRACE_FLPY_INT
 	calls++;