Eliminate the follow smatch warning: drivers/block/paride/on26.c:158 on26_test_port() warn: inconsistent indenting. Reported-by: Abaci Robot <abaci@xxxxxxxxxxxxxxxxx> Signed-off-by: Jiapeng Chong <jiapeng.chong@xxxxxxxxxxxxxxxxx> --- drivers/block/paride/on26.c | 85 +++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 41 deletions(-) diff --git a/drivers/block/paride/on26.c b/drivers/block/paride/on26.c index 95ba256921f2..d2ee74dbee29 100644 --- a/drivers/block/paride/on26.c +++ b/drivers/block/paride/on26.c @@ -125,61 +125,64 @@ static void on26_disconnect ( PIA *pi ) #define RESET_WAIT 200 static int on26_test_port( PIA *pi) /* hard reset */ +{ + int i, m, d, x = 0, y = 0; -{ int i, m, d, x=0, y=0; - - pi->saved_r0 = r0(); - pi->saved_r2 = r2(); + pi->saved_r0 = r0(); + pi->saved_r2 = r2(); - d = pi->delay; - m = pi->mode; - pi->delay = 5; - pi->mode = 0; + d = pi->delay; + m = pi->mode; + pi->delay = 5; + pi->mode = 0; - w2(0xc); + w2(0xc); - CCP(0x30); CCP(0); + CCP(0x30); CCP(0); - w0(0xfe);w0(0xaa);w0(0x55);w0(0);w0(0xff); - i = ((r1() & 0xf0) << 4); w0(0x87); - i |= (r1() & 0xf0); w0(0x78); - w0(0x20);w2(4);w2(5); - i |= ((r1() & 0xf0) >> 4); - w2(4);w0(0xff); + w0(0xfe); w0(0xaa); w0(0x55); w0(0); w0(0xff); + i = ((r1() & 0xf0) << 4); w0(0x87); + i |= (r1() & 0xf0); w0(0x78); + w0(0x20); w2(4); w2(5); + i |= ((r1() & 0xf0) >> 4); + w2(4); w0(0xff); - if (i == 0xb5f) { + if (i == 0xb5f) { - w0(2); P1; w0(0); P2; - w0(3); P1; w0(0); P2; - w0(2); P1; w0(8); P2; udelay(100); - w0(2); P1; w0(0xa); P2; udelay(100); - w0(2); P1; w0(8); P2; udelay(1000); + w0(2); P1; w0(0); P2; + w0(3); P1; w0(0); P2; + w0(2); P1; w0(8); P2; udelay(100); + w0(2); P1; w0(0xa); P2; udelay(100); + w0(2); P1; w0(8); P2; udelay(1000); - on26_write_regr(pi,0,6,0xa0); + on26_write_regr(pi, 0, 6, 0xa0); - for (i=0;i<RESET_WAIT;i++) { - on26_write_regr(pi,0,6,0xa0); - x = on26_read_regr(pi,0,7); - on26_write_regr(pi,0,6,0xb0); - y = on26_read_regr(pi,0,7); - if (!((x&0x80)||(y&0x80))) break; - mdelay(100); - } + for (i = 0; i < RESET_WAIT; i++) { + on26_write_regr(pi, 0, 6, 0xa0); + x = on26_read_regr(pi, 0, 7); - if (i == RESET_WAIT) - printk("on26: Device reset failed (%x,%x)\n",x,y); + on26_write_regr(pi, 0, 6, 0xb0); + y = on26_read_regr(pi, 0, 7); - w0(4); P1; w0(4); P1; - } + if (!((x & 0x80) || (y & 0x80))) + break; + mdelay(100); + } - CCP(0x30); + if (i == RESET_WAIT) + printk("on26: Device reset failed (%x,%x)\n", x, y); - pi->delay = d; - pi->mode = m; - w0(pi->saved_r0); - w2(pi->saved_r2); + w0(4); P1; w0(4); P1; + } + + CCP(0x30); + + pi->delay = d; + pi->mode = m; + w0(pi->saved_r0); + w2(pi->saved_r2); - return 5; + return 5; } -- 2.20.1.7.g153144c