evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sparc32: Remove some more sun4c code from floppy glue.

Browse source 
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2012-05-11 21:39:48 -07:00
parent 4c84d26c9a
commit 0301a6cbcc
1 changed files with 2 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/sparc/include/asm/floppy_32.h
View file

@ -102,24 +102,12 @@ static struct sun_floppy_ops sun_fdops;
/* Routines unique to each controller type on a Sun. */ /* Routines unique to each controller type on a Sun. */
static void sun_set_dor(unsigned char value, int fdc_82077) static void sun_set_dor(unsigned char value, int fdc_82077)
{ {
if (sparc_cpu_model == sun4c) { if (fdc_82077)
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) {
sun_fdc->dor_82077 = value; sun_fdc->dor_82077 = value;
} }
}
static unsigned char sun_read_dir(void) 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;
} }