Messages in this thread | | | Date | Thu, 30 Sep 2021 12:50:19 +0200 | From | Sebastian Reichel <> | Subject | Re: [PATCH] power: supply: core: Move psy_has_property() to fix build |
| |
Hi,
On Wed, Sep 29, 2021 at 09:02:17AM -0700, Matthias Kaehlcke wrote: > On Tue, Sep 28, 2021 at 02:00:19PM +0200, Geert Uytterhoeven wrote: > > If CONFIG_THERMAL=n: > > > > drivers/power/supply/power_supply_core.c: In function ‘__power_supply_register’: > > drivers/power/supply/power_supply_core.c:1137:6: error: implicit declaration of function ‘psy_has_property’ [-Werror=implicit-function-declaration] > > 1137 | if (psy_has_property(desc, POWER_SUPPLY_PROP_USB_TYPE) && > > | ^~~~~~~~~~~~~~~~ > > > > Fix this by moving psy_has_property() outside the section protected by > > CONFIG_THERMAL. > > > > Fixes: 9ba533eb99bb2acf ("power: supply: core: Add psy_has_property()") > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > > ---
Thanks, queued.
-- Sebastian
> > drivers/power/supply/power_supply_core.c | 32 ++++++++++++------------ > > 1 file changed, 16 insertions(+), 16 deletions(-) > > > > diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c > > index 75575ea45f21ddc7..fc12a4f407f431a6 100644 > > --- a/drivers/power/supply/power_supply_core.c > > +++ b/drivers/power/supply/power_supply_core.c > > @@ -951,6 +951,22 @@ void power_supply_unreg_notifier(struct notifier_block *nb) > > } > > EXPORT_SYMBOL_GPL(power_supply_unreg_notifier); > > > > +static bool psy_has_property(const struct power_supply_desc *psy_desc, > > + enum power_supply_property psp) > > +{ > > + bool found = false; > > + int i; > > + > > + for (i = 0; i < psy_desc->num_properties; i++) { > > + if (psy_desc->properties[i] == psp) { > > + found = true; > > + break; > > + } > > + } > > + > > + return found; > > +} > > + > > #ifdef CONFIG_THERMAL > > static int power_supply_read_temp(struct thermal_zone_device *tzd, > > int *temp) > > @@ -975,22 +991,6 @@ static struct thermal_zone_device_ops psy_tzd_ops = { > > .get_temp = power_supply_read_temp, > > }; > > > > -static bool psy_has_property(const struct power_supply_desc *psy_desc, > > - enum power_supply_property psp) > > -{ > > - bool found = false; > > - int i; > > - > > - for (i = 0; i < psy_desc->num_properties; i++) { > > - if (psy_desc->properties[i] == psp) { > > - found = true; > > - break; > > - } > > - } > > - > > - return found; > > -} > > - > > static int psy_register_thermal(struct power_supply *psy) > > { > > int ret; > > Thanks for the fix! > > Reviewed-by: Matthias Kaehlcke <mka@chromium.org> [unhandled content-type:application/pgp-signature] | |