diff options
author | David S. Miller <davem@davemloft.net> | 2012-05-12 00:39:48 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-05-12 00:39:48 -0400 |
commit | 0301a6cbccdc2a0bf8fec756b39faa4d9e753f2d (patch) | |
tree | 48d8551059abbd80820ed63355f2bfc38ba8bf09 | |
parent | 4c84d26c9a61627fb537e50397fdf59168f9adca (diff) |
sparc32: Remove some more sun4c code from floppy glue.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/include/asm/floppy_32.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h index 80382abd1cc5..f9548568ca8f 100644 --- a/arch/sparc/include/asm/floppy_32.h +++ b/arch/sparc/include/asm/floppy_32.h | |||
@@ -102,25 +102,13 @@ static struct sun_floppy_ops sun_fdops; | |||
102 | /* Routines unique to each controller type on a Sun. */ | 102 | /* Routines unique to each controller type on a Sun. */ |
103 | static void sun_set_dor(unsigned char value, int fdc_82077) | 103 | static void sun_set_dor(unsigned char value, int fdc_82077) |
104 | { | 104 | { |
105 | if (sparc_cpu_model == sun4c) { | 105 | if (fdc_82077) |
106 | unsigned int bits = 0; | ||
107 | if (value & 0x10) | ||
108 | bits |= AUXIO_FLPY_DSEL; | ||
109 | if ((value & 0x80) == 0) | ||
110 | bits |= AUXIO_FLPY_EJCT; | ||
111 | set_auxio(bits, (~bits) & (AUXIO_FLPY_DSEL|AUXIO_FLPY_EJCT)); | ||
112 | } | ||
113 | if (fdc_82077) { | ||
114 | sun_fdc->dor_82077 = value; | 106 | sun_fdc->dor_82077 = value; |
115 | } | ||
116 | } | 107 | } |
117 | 108 | ||
118 | static unsigned char sun_read_dir(void) | 109 | static unsigned char sun_read_dir(void) |
119 | { | 110 | { |
120 | if (sparc_cpu_model == sun4c) | 111 | return sun_fdc->dir_82077; |
121 | return (get_auxio() & AUXIO_FLPY_DCHG) ? 0x80 : 0; | ||
122 | else | ||
123 | return sun_fdc->dir_82077; | ||
124 | } | 112 | } |
125 | 113 | ||
126 | static unsigned char sun_82072_fd_inb(int port) | 114 | static unsigned char sun_82072_fd_inb(int port) |