floppy: use symbolic register names in the parisc port

Now we can use FD_STATUS and FD_DATA instead of 4 or 5, let's do
this, and also use STATUS_DMA and STATUS_READY for the status bits.

Link: https://lore.kernel.org/r/20200331094054.24441-5-w@1wt.eu
Cc: Helge Deller <deller@gmx.de>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Denis Efremov <efremov@linux.com>

diff --git a/arch/parisc/include/asm/floppy.h b/arch/parisc/include/asm/floppy.h
index 1aebc23b77443c920634becd6f4ff62f3951d4fa..762cfe7778c054117d5be53f422a2b894721778f 100644 (file)
--- a/arch/parisc/include/asm/floppy.h
+++ b/arch/parisc/include/asm/floppy.h
@@ -75,27 +75,28 @@ static void floppy_hardint(int irq, void *dev_id, struct pt_regs * regs)
                register char *lptr = virtual_dma_addr;
 
                for (lcount = virtual_dma_count; lcount; lcount--) {
-                       st = fd_inb(virtual_dma_port, 4) & 0xa0;
-                       if (st != 0xa0) 
+                       st = fd_inb(virtual_dma_port, FD_STATUS);
+                       st &= STATUS_DMA | STATUS_READY;
+                       if (st != (STATUS_DMA | STATUS_READY))
                                break;
                        if (virtual_dma_mode) {
-                               fd_outb(*lptr, virtual_dma_port, 5);
+                               fd_outb(*lptr, virtual_dma_port, FD_DATA);
                        } else {
-                               *lptr = fd_inb(virtual_dma_port, 5);
+                               *lptr = fd_inb(virtual_dma_port, FD_DATA);
                        }
                        lptr++;
                }
                virtual_dma_count = lcount;
                virtual_dma_addr = lptr;
-               st = fd_inb(virtual_dma_port, 4);
+               st = fd_inb(virtual_dma_port, FD_STATUS);
        }
 
 #ifdef TRACE_FLPY_INT
        calls++;
 #endif
-       if (st == 0x20)
+       if (st == STATUS_DMA)
                return;
-       if (!(st & 0x20)) {
+       if (!(st & STATUS_DMA)) {
                virtual_dma_residue += virtual_dma_count;
                virtual_dma_count = 0;
 #ifdef TRACE_FLPY_INT