2021-09-28 12:02:35

by Geert Uytterhoeven

[permalink] [raw]

Subject: [PATCH] power: supply: core: Move psy_has_property() to fix build

---

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 <[email protected]>
---
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;
--
2.25.1

2021-09-29 16:11:02

by Matthias Kaehlcke

[permalink] [raw]

Subject: Re: [PATCH] power: supply: core: Move psy_has_property() to fix build

---

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 <[email protected]>
> ---
> 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 <[email protected]>

2021-09-30 12:24:15

by Sebastian Reichel

[permalink] [raw]

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 <[email protected]>
> > ---

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 <[email protected]>

---

Attachments:

(No filename) (2.53 kB)
signature.asc (849.00 B)
Download all attachments