aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/floppy.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 26e76947dbd1..639ed14bb08d 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -783,7 +783,10 @@ static inline int is_selected(int dor, int unit)
783 783
784static int set_dor(int fdc, char mask, char data) 784static int set_dor(int fdc, char mask, char data)
785{ 785{
786 register unsigned char drive, unit, newdor, olddor; 786 unsigned char unit;
787 unsigned char drive;
788 unsigned char newdor;
789 unsigned char olddor;
787 790
788 if (FDCS->address == -1) 791 if (FDCS->address == -1)
789 return -1; 792 return -1;
@@ -937,7 +940,7 @@ static void motor_off_callback(unsigned long nr)
937static void floppy_off(unsigned int drive) 940static void floppy_off(unsigned int drive)
938{ 941{
939 unsigned long volatile delta; 942 unsigned long volatile delta;
940 register int fdc = FDC(drive); 943 int fdc = FDC(drive);
941 944
942 if (!(FDCS->dor & (0x10 << UNIT(drive)))) 945 if (!(FDCS->dor & (0x10 << UNIT(drive))))
943 return; 946 return;