[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210308133146.3168995-1-raychi@google.com>
Date: Mon, 8 Mar 2021 21:31:46 +0800
From: Ray Chi <raychi@...gle.com>
To: sre@...nel.org, gregkh@...uxfoundation.org,
naresh.kamboju@...aro.org
Cc: kyletso@...gle.com, linux-pm@...r.kernel.org,
linux-kernel@...r.kernel.org, Ray Chi <raychi@...gle.com>
Subject: [PATCH] usb: dwc3: fix build error when POWER_SUPPLY is not enabled
Fix build error when CONFIG_POWER_SUPPLY is not enabled.
The build error occurs in mips (cavium_octeon_defconfig).
mips-linux-gnu-ld: drivers/usb/dwc3/core.o: in function `dwc3_remove':
drivers/usb/dwc3/core.c:1657: undefined reference to `power_supply_put'
mips-linux-gnu-ld: drivers/usb/dwc3/core.o: in function `dwc3_get_properties':
drivers/usb/dwc3/core.c:1270: undefined reference to `power_supply_get_by_name'
mips-linux-gnu-ld: drivers/usb/dwc3/core.o: in function `dwc3_probe':
drivers/usb/dwc3/core.c:1632: undefined reference to `power_supply_put'
Fixes: 59fa3def35de ("usb: dwc3: add a power supply for current control")
Reported-by: Naresh Kamboju <naresh.kamboju@...aro.org>
Signed-off-by: Ray Chi <raychi@...gle.com>
---
include/linux/power_supply.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
index 81a55e974feb..6e776be5bfa0 100644
--- a/include/linux/power_supply.h
+++ b/include/linux/power_supply.h
@@ -381,8 +381,14 @@ struct power_supply_battery_info {
extern struct atomic_notifier_head power_supply_notifier;
extern int power_supply_reg_notifier(struct notifier_block *nb);
extern void power_supply_unreg_notifier(struct notifier_block *nb);
+#if IS_ENABLED(CONFIG_POWER_SUPPLY)
extern struct power_supply *power_supply_get_by_name(const char *name);
extern void power_supply_put(struct power_supply *psy);
+#else
+static inline void power_supply_put(struct power_supply *psy) {}
+static inline struct power_supply *power_supply_get_by_name(const char *name)
+{ return NULL; }
+#endif
#ifdef CONFIG_OF
extern struct power_supply *power_supply_get_by_phandle(struct device_node *np,
const char *property);
--
2.30.1.766.gb4fecdf3b7-goog
Powered by blists - more mailing lists