| Message ID | 20220414085710.2541867-1-chi.minghao@zte.com.cn (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 433302dd8772fc4fe2b9ddcdb42f6a378317c665 |
| Headers | show |
| Series | input: omap4-keypad: using pm_runtime_resume_and_get instead of pm_runtime_get_sync | expand |
On Thu, Apr 14, 2022 at 08:57:10AM +0000, cgel.zte@gmail.com wrote: > From: Minghao Chi <chi.minghao@zte.com.cn> > > Using pm_runtime_resume_and_get() to replace pm_runtime_get_sync and > pm_runtime_put_noidle. This change is just to simplify the code, no > actual functional changes. > > Reported-by: Zeal Robot <zealci@zte.com.cn> > Signed-off-by: Minghao Chi <chi.minghao@zte.com.cn> > --- > drivers/input/keyboard/omap4-keypad.c | 21 +++++++-------------- > 1 file changed, 7 insertions(+), 14 deletions(-) > > diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c > index 43375b38ee59..df6ab8006807 100644 > --- a/drivers/input/keyboard/omap4-keypad.c > +++ b/drivers/input/keyboard/omap4-keypad.c > @@ -179,11 +179,9 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id) > int error; > u64 keys; > > - error = pm_runtime_get_sync(dev); > - if (error < 0) { > - pm_runtime_put_noidle(dev); > + error = pm_runtime_resume_and_get(dev); > + if (error < 0) pm_runtime_resume_and_get() returns 0 or negative error, so we can simplify the check to "if (error)". I adjusted locally and applied, thank you.
diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c index 43375b38ee59..df6ab8006807 100644 --- a/drivers/input/keyboard/omap4-keypad.c +++ b/drivers/input/keyboard/omap4-keypad.c @@ -179,11 +179,9 @@ static irqreturn_t omap4_keypad_irq_thread_fn(int irq, void *dev_id) int error; u64 keys; - error = pm_runtime_get_sync(dev); - if (error < 0) { - pm_runtime_put_noidle(dev); + error = pm_runtime_resume_and_get(dev); + if (error < 0) return IRQ_NONE; - } low = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE31_0); high = kbd_readl(keypad_data, OMAP4_KBD_FULLCODE63_32); @@ -207,11 +205,9 @@ static int omap4_keypad_open(struct input_dev *input) struct device *dev = input->dev.parent; int error; - error = pm_runtime_get_sync(dev); - if (error < 0) { - pm_runtime_put_noidle(dev); + error = pm_runtime_resume_and_get(dev); + if (error < 0) return error; - } disable_irq(keypad_data->irq); @@ -254,9 +250,7 @@ static void omap4_keypad_close(struct input_dev *input) struct device *dev = input->dev.parent; int error; - error = pm_runtime_get_sync(dev); - if (error < 0) - pm_runtime_put_noidle(dev); + error = pm_runtime_resume_and_get(dev); disable_irq(keypad_data->irq); omap4_keypad_stop(keypad_data); @@ -392,10 +386,9 @@ static int omap4_keypad_probe(struct platform_device *pdev) * Enable clocks for the keypad module so that we can read * revision register. */ - error = pm_runtime_get_sync(dev); + error = pm_runtime_resume_and_get(dev); if (error) { - dev_err(dev, "pm_runtime_get_sync() failed\n"); - pm_runtime_put_noidle(dev); + dev_err(dev, "pm_runtime_resume_and_get() failed\n"); return error; }