Cleanup.

2 files changed, 19 insertions, 59 deletions

diff --git a/include/asm-alpha/floppy.h b/include/asm-alpha/floppy.h
index 36fb2c5e9..8203920b9 100644
--- a/include/asm-alpha/floppy.h
+++ b/include/asm-alpha/floppy.h
@@ -15,23 +15,21 @@
 #define fd_inb(port)			inb_p(port)
 #define fd_outb(port,value)		outb_p(port,value)
 
-#define fd_enable_dma(channel)		enable_dma(channel)
-#define fd_disable_dma(channel)		disable_dma(channel)
-#define fd_request_dma(channel)		request_dma(channel, "floppy")
-#define fd_free_dma(channel)		free_dma(channel)
-#define fd_clear_dma_ff(channel)	clear_dma_ff(channel)
-#define fd_set_dma_mode(channel, mode)	set_dma_mode(channel, mode)
-#define fd_set_dma_addr(channel, addr)	set_dma_addr(channel,virt_to_bus(addr))
-#define fd_set_dma_count(channel, count) set_dma_count(channel,count)
-
-#define fd_enable_irq(irq)		enable_irq(irq)
-#define fd_disable_irq(irq)		disable_irq(irq)
-#define fd_request_irq(irq)		request_irq(irq, \
-					            floppy_interrupt, \
-					            SA_INTERRUPT \
-					            | SA_SAMPLE_RANDOM, \
-					            "floppy", NULL)
-#define fd_free_irq(irq)		free_irq(irq,  NULL);
+#define fd_enable_dma()         enable_dma(FLOPPY_DMA)
+#define fd_disable_dma()        disable_dma(FLOPPY_DMA)
+#define fd_request_dma()        request_dma(FLOPPY_DMA,"floppy")
+#define fd_free_dma()           free_dma(FLOPPY_DMA)
+#define fd_clear_dma_ff()       clear_dma_ff(FLOPPY_DMA)
+#define fd_set_dma_mode(mode)   set_dma_mode(FLOPPY_DMA,mode)
+#define fd_set_dma_addr(addr)   set_dma_addr(FLOPPY_DMA,virt_to_bus(addr))
+#define fd_set_dma_count(count) set_dma_count(FLOPPY_DMA,count)
+#define fd_enable_irq()         enable_irq(FLOPPY_IRQ)
+#define fd_disable_irq()        disable_irq(FLOPPY_IRQ)
+#define fd_cacheflush(addr,size) /* nothing */
+#define fd_request_irq()        request_irq(FLOPPY_IRQ, floppy_interrupt, \
+					    SA_INTERRUPT|SA_SAMPLE_RANDOM, \
+				            "floppy", NULL)
+#define fd_free_irq()           free_irq(FLOPPY_IRQ, NULL);
 
 __inline__ void virtual_dma_init(void)
 {
diff --git a/include/asm-alpha/keyboard.h b/include/asm-alpha/keyboard.h
index 429898812..eb0047023 100644
--- a/include/asm-alpha/keyboard.h
+++ b/include/asm-alpha/keyboard.h
@@ -2,8 +2,6 @@
  *  linux/include/asm-alpha/keyboard.h
  *
  *  Created 3 Nov 1996 by Geert Uytterhoeven
- *
- * $Id: keyboard.h,v 1.9 1999/11/19 20:35:47 ralf Exp $
  */
 
 /*
@@ -15,10 +13,6 @@
 
 #ifdef __KERNEL__
 
-#include <linux/config.h>
-#include <linux/ioport.h>
-#include <asm/io.h>
-
 #define KEYBOARD_IRQ			1
 #define DISABLE_KBD_DURING_INTERRUPTS	0
 
@@ -39,42 +33,9 @@ extern unsigned char pckbd_sysrq_xlate[128];
 #define kbd_init_hw		pckbd_init_hw
 #define kbd_sysrq_xlate		pckbd_sysrq_xlate
 
-#define SYSRQ_KEY 0x54
-
-/*
- * keyboard controller registers
- */
-#define KBD_STATUS_REG      (unsigned int) 0x64
-#define KBD_CNTL_REG        (unsigned int) 0x64
-#define KBD_DATA_REG        (unsigned int) 0x60
-
-/* How to access the keyboard macros on this platform.  */
-#define kbd_read_input() inb(KBD_DATA_REG)
-#define kbd_read_status() inb(KBD_STATUS_REG)
-#define kbd_write_output(val) outb(val, KBD_DATA_REG)
-#define kbd_write_command(val) outb(val, KBD_CNTL_REG)
+#define INIT_KBD
 
-/* Some stoneage hardware needs delays after some operations.  */
-#define kbd_pause() do { } while(0)
-
-/* Get the keyboard controller registers (incomplete decode) */
-#define kbd_request_region() request_region(0x60, 16, "keyboard")
-
-#define kbd_request_irq() request_irq(KEYBOARD_IRQ, keyboard_interrupt, 0, \
-                                      "keyboard", NULL);
-
-/*
- * Machine specific bits for the PS/2 driver
- */
-#if defined(__alpha__) && !defined(CONFIG_PCI)
-# define AUX_IRQ	9		/* Jensen is odd indeed */
-#else
-# define AUX_IRQ	12
-#endif
-
-#define aux_request_irq(handler, dev_id) request_irq(AUX_IRQ, handler, 0, \
-	"PS/2 Mouse", NULL)
-#define aux_free_irq(dev_id) free_irq(AUX_IRQ, NULL)
+#define SYSRQ_KEY 0x54
 
 /* resource allocation */
 #define kbd_request_region()
@@ -102,4 +63,5 @@ extern unsigned char pckbd_sysrq_xlate[128];
 #define aux_free_irq(dev_id) free_irq(AUX_IRQ, dev_id)
 
 #endif /* __KERNEL__ */
-#endif /* __ASM_ALPHA_KEYBOARD_H */
+
+#endif /* __ASMalpha_KEYBOARD_H */