From: Jesper Juhl Date: Wed, 17 Oct 2007 06:30:58 +0000 (-0700) Subject: floppy: remove register keyword use from floppy driver X-Git-Tag: v2.6.24-rc1~551 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fdc1ca8abae72c5829e099fd35626b83ecb12666;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 26e76947dbd..639ed14bb08 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -783,7 +783,10 @@ static inline int is_selected(int dor, int unit) static int set_dor(int fdc, char mask, char data) { - register unsigned char drive, unit, newdor, olddor; + unsigned char unit; + unsigned char drive; + unsigned char newdor; + unsigned char olddor; if (FDCS->address == -1) return -1; @@ -937,7 +940,7 @@ static void motor_off_callback(unsigned long nr) static void floppy_off(unsigned int drive) { unsigned long volatile delta; - register int fdc = FDC(drive); + int fdc = FDC(drive); if (!(FDCS->dor & (0x10 << UNIT(drive)))) return;