diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-12 08:39:48 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-12 08:39:48 +0400 |
| commit | 0301a6cbccdc2a0bf8fec756b39faa4d9e753f2d (patch) | |
| tree | 48d8551059abbd80820ed63355f2bfc38ba8bf09 /arch/sparc/include/asm | |
| parent | 4c84d26c9a61627fb537e50397fdf59168f9adca (diff) | |
| download | linux-0301a6cbccdc2a0bf8fec756b39faa4d9e753f2d.tar.xz | |
sparc32: Remove some more sun4c code from floppy glue.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm')
| -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; /* Routines unique to each controller type on a Sun. */ static void sun_set_dor(unsigned char value, int fdc_82077) { - if (sparc_cpu_model == sun4c) { - unsigned int bits = 0; - if (value & 0x10) - bits |= AUXIO_FLPY_DSEL; - if ((value & 0x80) == 0) - bits |= AUXIO_FLPY_EJCT; - set_auxio(bits, (~bits) & (AUXIO_FLPY_DSEL|AUXIO_FLPY_EJCT)); - } - if (fdc_82077) { + if (fdc_82077) sun_fdc->dor_82077 = value; - } } static unsigned char sun_read_dir(void) { - if (sparc_cpu_model == sun4c) - return (get_auxio() & AUXIO_FLPY_DCHG) ? 0x80 : 0; - else - return sun_fdc->dir_82077; + return sun_fdc->dir_82077; } static unsigned char sun_82072_fd_inb(int port) |