On Mon, Feb 1, 2021 at 11:11 AM Ulf Hansson <ulf.hans...@linaro.org> wrote: > > On Wed, 27 Jan 2021 at 09:42, Abaci Team <abaci-bug...@linux.alibaba.com> > wrote: > > > > Fix the following coccicheck warnings: > > > > ./drivers/base/power/domain.c:938:31-33: WARNING !A || A && B is > > equivalent to !A || B. > > > > Reported-by: Abaci Robot <ab...@linux.alibaba.com> > > Suggested-by: Jiapeng Zhong <o...@linux.alibaba.com> > > Signed-off-by: Abaci Team <abaci-bug...@linux.alibaba.com> > > Acked-by: Ulf Hansson <ulf.hans...@linaro.org>
Applied as 5.12 material, thanks! > > --- > > drivers/base/power/domain.c | 3 +-- > > 1 file changed, 1 insertion(+), 2 deletions(-) > > > > diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c > > index 9a14eed..e689710 100644 > > --- a/drivers/base/power/domain.c > > +++ b/drivers/base/power/domain.c > > @@ -934,8 +934,7 @@ static int genpd_runtime_resume(struct device *dev) > > err_stop: > > genpd_stop_dev(genpd, dev); > > err_poweroff: > > - if (!pm_runtime_is_irq_safe(dev) || > > - (pm_runtime_is_irq_safe(dev) && genpd_is_irq_safe(genpd))) { > > + if (!pm_runtime_is_irq_safe(dev) || genpd_is_irq_safe(genpd)) { > > genpd_lock(genpd); > > genpd_power_off(genpd, true, 0); > > genpd_unlock(genpd); > > -- > > 1.8.3.1 > >