mfd: wm831x: Remove redundant forever while loop
Subsystems (2)
PATCH RESEND v3 1/1 mfd: wm831x: Remove redundant forever while loop
Current code excutes only once despite the while loop, so remove the loop. Also msleep(1) will likely result in a larger sleep, so increase its value for clarity while keeping the same behaviour.
---
V2 -> V3: formatting changes: fixed a comment and 2 line-ups, added a new line V1 -> V2: removed unused variable 'timeout'
drivers/mfd/wm831x-auxadc.c | 43 ++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 25 deletions(-)
drivers/mfd/wm831x-auxadc.c +18 -25
@@ -152,7 +152,7 @@ static irqreturn_t wm831x_auxadc_irq(int irq, void *irq_data)static int wm831x_auxadc_read_polled (struct wm831x *wm831x,enum wm831x_auxadc input) { -int ret, src, timeout; +int ret, src;mutex_lock (&wm831x->auxadc_lock);
@@ -179,32 +179,25 @@ static int wm831x_auxadc_read_polled(struct wm831x *wm831x, goto disable; } -/* If we're not using interrupts then poll the -* interrupt status register */ - timeout =5 ; -while (timeout) { -msleep (1 ); +/* If we're not using interrupts then read the interrupt status register */ +msleep (20 ); - ret =wm831x_reg_read (wm831x, -WM831X_INTERRUPT_STATUS_1 ); -if (ret <0 ) { -dev_err (wm831x->dev, -"ISR 1 read failed: %d\n" , ret); - goto disable; - } + ret =wm831x_reg_read (wm831x,WM831X_INTERRUPT_STATUS_1 ); +if (ret <0 ) { +dev_err (wm831x->dev, +"ISR 1 read failed: %d\n" , ret); + goto disable; + } -/* Did it complete? */ -if (ret &WM831X_AUXADC_DATA_EINT ) { -wm831x_reg_write (wm831x, -WM831X_INTERRUPT_STATUS_1 , -WM831X_AUXADC_DATA_EINT ); -break ; - }else { -dev_err (wm831x->dev, -"AUXADC conversion timeout\n" ); - ret = -EBUSY ; - goto disable; - } +/* Did it complete? */ +if (ret &WM831X_AUXADC_DATA_EINT ) { +wm831x_reg_write (wm831x,WM831X_INTERRUPT_STATUS_1 , +WM831X_AUXADC_DATA_EINT ); + }else { +dev_err (wm831x->dev, +"AUXADC conversion timeout\n" ); + ret = -EBUSY ; + goto disable; } ret =wm831x_reg_read (wm831x,WM831X_AUXADC_DATA );
--
2.34.1
Quoted 6 lines · Maciej Strozek
Current code excutes only once despite the while loop, so remove the loop. Also msleep(1) will likely result in a larger sleep, so increase its value for clarity while keeping the same behaviour.
Signed-off-by Maciej Strozek <[email protected]>---
Thanks,
Charles
Re: (subset) [RESEND PATCH v3] mfd: wm831x: Remove redundant forever while loop
In reply to Maciej StrozekQuoted 5 lines · Maciej Strozek
Current code excutes only once despite the while loop, so remove the loop. Also msleep(1) will likely result in a larger sleep, so increase its value for clarity while keeping the same behaviour.
Applied, thanks!
[1/1] mfd: wm831x: Remove redundant forever while loop
commit: 1e0ea9e75ff3f395ad6f85f0be2258ef114a53dc
--
Lee Jones [李琼斯]