diff options
| author | Anda-Maria Nicolae <anda-maria.nicolae@intel.com> | 2015-06-03 11:47:03 +0300 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-06-03 13:23:55 +0200 |
| commit | fb323eccbcaff06c1ed21ab989198eb40df6e846 (patch) | |
| tree | 1440dddccea854c83d70c01a8485f7e0d9f0f719 /drivers/power | |
| parent | bcd56fe1aa97117f8cfad68280d9aa6d403fd815 (diff) | |
| download | linux-stable-fb323eccbcaff06c1ed21ab989198eb40df6e846.tar.gz linux-stable-fb323eccbcaff06c1ed21ab989198eb40df6e846.tar.bz2 linux-stable-fb323eccbcaff06c1ed21ab989198eb40df6e846.zip | |
power_supply: rt9455_charger: Check if CONFIG_USB_PHY is enabled
If CONFIG_USB_PHY is not enabled, struct notifier_block is not defined and
compilation fails. Therefore, the functions that process USB event
notifications are defined only if CONFIG_USB_PHY is enabled.
There is no need to define these functions if CONFIG_USB_PHY is not
enabled, since no USB notifications are received in this case.
Also, since rt9455_set_boost_voltage_before_boost_mode() function is
called only if USB_EVENT_ID notification is received, this function should
also be defined only if CONFIG_USB_PHY is enabled.
Signed-off-by: Anda-Maria Nicolae <anda-maria.nicolae@intel.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/power')
| -rw-r--r-- | drivers/power/rt9455_charger.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/power/rt9455_charger.c b/drivers/power/rt9455_charger.c index 7c0c1ffa84ec..de86913037db 100644 --- a/drivers/power/rt9455_charger.c +++ b/drivers/power/rt9455_charger.c @@ -804,6 +804,7 @@ static int rt9455_hw_init(struct rt9455_info *info, u32 ichrg, return 0; } +#if IS_ENABLED(CONFIG_USB_PHY) /* * Before setting the charger into boost mode, boost output voltage is * set. This is needed because boost output voltage may differ from battery @@ -828,6 +829,7 @@ static int rt9455_set_boost_voltage_before_boost_mode(struct rt9455_info *info) return 0; } +#endif /* * Before setting the charger into charge mode, battery regulation voltage is @@ -1241,6 +1243,7 @@ static int rt9455_discover_charger(struct rt9455_info *info, u32 *ichrg, return 0; } +#if IS_ENABLED(CONFIG_USB_PHY) static int rt9455_usb_event_none(struct rt9455_info *info, u8 opa_mode, u8 iaicr) { @@ -1445,6 +1448,7 @@ static int rt9455_usb_event(struct notifier_block *nb, } return NOTIFY_DONE; } +#endif static void rt9455_pwr_rdy_work_callback(struct work_struct *work) { |