| Message ID | 1596166744-2954-2-git-send-email-neal.liu@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | acpi: fix 'return' with no value build warning | expand |
On Fri, Jul 31, 2020 at 5:39 AM Neal Liu <neal.liu@mediatek.com> wrote: > > Fixing CFI issue which introduced by commit efe9711214e6 is > incomplete. > Add return value to fix return-type build warning. > > Signed-off-by: Neal Liu <neal.liu@mediatek.com> Applied with edited subject and changelog, but -> > --- > drivers/acpi/processor_idle.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c > index 6ffb6c9..6870020 100644 > --- a/drivers/acpi/processor_idle.c > +++ b/drivers/acpi/processor_idle.c > @@ -664,11 +664,11 @@ static int acpi_idle_enter_s2idle(struct cpuidle_device *dev, > struct acpi_processor *pr = __this_cpu_read(processors); > > if (unlikely(!pr)) > - return; > + return -EFAULT; -> there is no point returning an error code here, so I've made it just return 0. > > if (pr->flags.bm_check) { > acpi_idle_enter_bm(pr, cx, false); > - return; > + return 0; > } else { > ACPI_FLUSH_CPU_CACHE(); > } > --
On Fri, 2020-07-31 at 13:33 +0200, Rafael J. Wysocki wrote: > On Fri, Jul 31, 2020 at 5:39 AM Neal Liu <neal.liu@mediatek.com> wrote: > > > > Fixing CFI issue which introduced by commit efe9711214e6 is > > incomplete. > > Add return value to fix return-type build warning. > > > > Signed-off-by: Neal Liu <neal.liu@mediatek.com> > > Applied with edited subject and changelog, but -> > > > --- > > drivers/acpi/processor_idle.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c > > index 6ffb6c9..6870020 100644 > > --- a/drivers/acpi/processor_idle.c > > +++ b/drivers/acpi/processor_idle.c > > @@ -664,11 +664,11 @@ static int acpi_idle_enter_s2idle(struct cpuidle_device *dev, > > struct acpi_processor *pr = __this_cpu_read(processors); > > > > if (unlikely(!pr)) > > - return; > > + return -EFAULT; > > -> there is no point returning an error code here, so I've made it > just return 0. return 0 is not matched with the meaning of contexts, but it's fine for this patch. Thanks ! > > > > > if (pr->flags.bm_check) { > > acpi_idle_enter_bm(pr, cx, false); > > - return; > > + return 0; > > } else { > > ACPI_FLUSH_CPU_CACHE(); > > } > > --
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 6ffb6c9..6870020 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -664,11 +664,11 @@ static int acpi_idle_enter_s2idle(struct cpuidle_device *dev, struct acpi_processor *pr = __this_cpu_read(processors); if (unlikely(!pr)) - return; + return -EFAULT; if (pr->flags.bm_check) { acpi_idle_enter_bm(pr, cx, false); - return; + return 0; } else { ACPI_FLUSH_CPU_CACHE(); }
Fixing CFI issue which introduced by commit efe9711214e6 is incomplete. Add return value to fix return-type build warning. Signed-off-by: Neal Liu <neal.liu@mediatek.com> --- drivers/acpi/processor_idle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)