From: Andrew Morton - no need to initialise `i'. - 80-col fix - other accidental cleanups Cc: Dmitry Torokhov Cc: Roland Scheidegger Signed-off-by: Andrew Morton --- drivers/input/serio/i8042.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff -puN drivers/input/serio/i8042.c~input-fix-aux-port-detection-with-some-i8042-chips-fix drivers/input/serio/i8042.c --- a/drivers/input/serio/i8042.c~input-fix-aux-port-detection-with-some-i8042-chips-fix +++ a/drivers/input/serio/i8042.c @@ -537,7 +537,7 @@ static int __devinit i8042_check_aux(voi int retval = -1; int irq_registered = 0; int aux_loop_broken = 0; - int i = 0; + int i; unsigned long flags; unsigned char param; @@ -577,21 +577,25 @@ static int __devinit i8042_check_aux(voi aux_loop_broken = 1; } -/* - * Bit assignment test - filters out PS/2 i8042's in AT mode - */ + /* + * Bit assignment test - filters out PS/2 i8042's in AT mode + */ if (i8042_command(¶m, I8042_CMD_AUX_DISABLE)) return -1; + /* some chips need some time to set the I8042_CTR_AUXDIS bit */ for (i = 0; i < 100; i++) { - if (!i8042_command(¶m, I8042_CMD_CTL_RCTR) && (param & I8042_CTR_AUXDIS)) + if (!i8042_command(¶m, I8042_CMD_CTL_RCTR) && + (param & I8042_CTR_AUXDIS)) break; udelay(50); } if (i == 100) { - printk(KERN_WARNING "Failed to disable AUX port, but continuing anyway... Is this a SiS?\n"); - printk(KERN_WARNING "If AUX port is really absent please use the 'i8042.noaux' option.\n"); + printk(KERN_WARNING "Failed to disable AUX port, but continuing" + " anyway... Is this a SiS?\n"); + printk(KERN_WARNING "If AUX port is really absent please use " + "the 'i8042.noaux' option.\n"); } if (i8042_command(¶m, I8042_CMD_AUX_ENABLE)) _