aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorJesper Juhl <jesper.juhl@gmail.com>2007-10-17 02:30:58 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:43:03 -0400
commitfdc1ca8abae72c5829e099fd35626b83ecb12666 (patch)
tree61456f13dcf6066e351e77801c6c4001b9429c05 /drivers/block/floppy.c
parentaee9041c5f36aa1353ada995c8f8bb3e6b167e4b (diff)
floppy: remove register keyword use from floppy driver
The floppy drive is slow. These days I see absolutely no good reason why the floppy driver should try to gain a tiny bit of speed by telling gcc to optimize access to some variables via the register keyword. Better to just leave gcc free to do whatever optimizations it deduces to be sane and not hamper it by telling it that some variables in the floppy driver are special and need to be fast (they don't). Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block/floppy.c')
-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;