diff mbox series

power: supply: Allow charger manager can be built as a module

Message ID 2d0854b00d7f85e988aff4f8186e8ac5d8a9aff2.1581410798.git.baolin.wang7@gmail.com (mailing list archive)
State Not Applicable, archived
Headers show
Series power: supply: Allow charger manager can be built as a module | expand

Commit Message

Baolin Wang Feb. 11, 2020, 8:50 a.m. UTC
Allow charger manager can be built as a module like other charger
drivers.

Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
---
 drivers/power/supply/Kconfig          |    2 +-
 include/linux/power/charger-manager.h |    7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

Comments

Orson Zhai Feb. 27, 2020, 4:06 p.m. UTC | #1
Hi Sebastian and other guys here,

On Tue, Feb 11, 2020 at 4:51 PM Baolin Wang <baolin.wang7@gmail.com> wrote:
>
> Allow charger manager can be built as a module like other charger
> drivers.
>
What do you think about this patch?
We want to set charger-manager as module in our project for new Android devices.

-Orson

> Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
> ---
>  drivers/power/supply/Kconfig          |    2 +-
>  include/linux/power/charger-manager.h |    7 +------
>  2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> index 9a5591a..195bc04 100644
> --- a/drivers/power/supply/Kconfig
> +++ b/drivers/power/supply/Kconfig
> @@ -480,7 +480,7 @@ config CHARGER_GPIO
>           called gpio-charger.
>
>  config CHARGER_MANAGER
> -       bool "Battery charger manager for multiple chargers"
> +       tristate "Battery charger manager for multiple chargers"
>         depends on REGULATOR
>         select EXTCON
>         help
> diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
> index ad19e68..40493b2 100644
> --- a/include/linux/power/charger-manager.h
> +++ b/include/linux/power/charger-manager.h
> @@ -248,11 +248,6 @@ struct charger_manager {
>         u64 charging_end_time;
>  };
>
> -#ifdef CONFIG_CHARGER_MANAGER
>  extern void cm_notify_event(struct power_supply *psy,
> -                               enum cm_event_types type, char *msg);
> -#else
> -static inline void cm_notify_event(struct power_supply *psy,
> -                               enum cm_event_types type, char *msg) { }
> -#endif
> +                           enum cm_event_types type, char *msg);
>  #endif /* _CHARGER_MANAGER_H */
> --
> 1.7.9.5
>
Saravana Kannan Feb. 28, 2020, 2:54 a.m. UTC | #2
On Thu, Feb 27, 2020 at 8:06 AM Orson Zhai <orsonzhai@gmail.com> wrote:
>
> Hi Sebastian and other guys here,
>
> On Tue, Feb 11, 2020 at 4:51 PM Baolin Wang <baolin.wang7@gmail.com> wrote:
> >
> > Allow charger manager can be built as a module like other charger
> > drivers.
> >
> What do you think about this patch?
> We want to set charger-manager as module in our project for new Android devices.
>
> -Orson
>
> > Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
> > ---
> >  drivers/power/supply/Kconfig          |    2 +-
> >  include/linux/power/charger-manager.h |    7 +------
> >  2 files changed, 2 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> > index 9a5591a..195bc04 100644
> > --- a/drivers/power/supply/Kconfig
> > +++ b/drivers/power/supply/Kconfig
> > @@ -480,7 +480,7 @@ config CHARGER_GPIO
> >           called gpio-charger.
> >
> >  config CHARGER_MANAGER
> > -       bool "Battery charger manager for multiple chargers"
> > +       tristate "Battery charger manager for multiple chargers"
> >         depends on REGULATOR
> >         select EXTCON
> >         help
> > diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
> > index ad19e68..40493b2 100644
> > --- a/include/linux/power/charger-manager.h
> > +++ b/include/linux/power/charger-manager.h
> > @@ -248,11 +248,6 @@ struct charger_manager {
> >         u64 charging_end_time;
> >  };
> >
> > -#ifdef CONFIG_CHARGER_MANAGER
> >  extern void cm_notify_event(struct power_supply *psy,
> > -                               enum cm_event_types type, char *msg);
> > -#else
> > -static inline void cm_notify_event(struct power_supply *psy,
> > -                               enum cm_event_types type, char *msg) { }
> > -#endif
> > +                           enum cm_event_types type, char *msg);
> >  #endif /* _CHARGER_MANAGER_H */

You are breaking the kernel if CONFIG_CHARGER_MANAGER is disabled. Why
not simple change the #ifdef to
#if IS_ENABLED(CONFIG_CHARGER_MANAGER)
?

-Saravana
Baolin Wang Feb. 28, 2020, 5:37 a.m. UTC | #3
On Fri, Feb 28, 2020 at 10:54 AM Saravana Kannan <saravanak@google.com> wrote:
>
> On Thu, Feb 27, 2020 at 8:06 AM Orson Zhai <orsonzhai@gmail.com> wrote:
> >
> > Hi Sebastian and other guys here,
> >
> > On Tue, Feb 11, 2020 at 4:51 PM Baolin Wang <baolin.wang7@gmail.com> wrote:
> > >
> > > Allow charger manager can be built as a module like other charger
> > > drivers.
> > >
> > What do you think about this patch?
> > We want to set charger-manager as module in our project for new Android devices.
> >
> > -Orson
> >
> > > Signed-off-by: Baolin Wang <baolin.wang7@gmail.com>
> > > ---
> > >  drivers/power/supply/Kconfig          |    2 +-
> > >  include/linux/power/charger-manager.h |    7 +------
> > >  2 files changed, 2 insertions(+), 7 deletions(-)
> > >
> > > diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> > > index 9a5591a..195bc04 100644
> > > --- a/drivers/power/supply/Kconfig
> > > +++ b/drivers/power/supply/Kconfig
> > > @@ -480,7 +480,7 @@ config CHARGER_GPIO
> > >           called gpio-charger.
> > >
> > >  config CHARGER_MANAGER
> > > -       bool "Battery charger manager for multiple chargers"
> > > +       tristate "Battery charger manager for multiple chargers"
> > >         depends on REGULATOR
> > >         select EXTCON
> > >         help
> > > diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
> > > index ad19e68..40493b2 100644
> > > --- a/include/linux/power/charger-manager.h
> > > +++ b/include/linux/power/charger-manager.h
> > > @@ -248,11 +248,6 @@ struct charger_manager {
> > >         u64 charging_end_time;
> > >  };
> > >
> > > -#ifdef CONFIG_CHARGER_MANAGER
> > >  extern void cm_notify_event(struct power_supply *psy,
> > > -                               enum cm_event_types type, char *msg);
> > > -#else
> > > -static inline void cm_notify_event(struct power_supply *psy,
> > > -                               enum cm_event_types type, char *msg) { }
> > > -#endif
> > > +                           enum cm_event_types type, char *msg);
> > >  #endif /* _CHARGER_MANAGER_H */
>
> You are breaking the kernel if CONFIG_CHARGER_MANAGER is disabled. Why

No, now no users in mainline have called cm_notify_event() function,
and if some charger drivers want to use the charger manager, they
should select CHARGER_MANAGER, like:
config CHARGER_SC2731
        tristate "Spreadtrum SC2731 charger driver"
        depends on MFD_SC27XX_PMIC || COMPILE_TEST
        select CHARGER_MANAGER

> not simple change the #ifdef to
> #if IS_ENABLED(CONFIG_CHARGER_MANAGER)
> ?

Yes, this also can work, and either way is okay for me. Sebastian,
what do you prefer? Thanks.
diff mbox series

Patch

diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index 9a5591a..195bc04 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -480,7 +480,7 @@  config CHARGER_GPIO
 	  called gpio-charger.
 
 config CHARGER_MANAGER
-	bool "Battery charger manager for multiple chargers"
+	tristate "Battery charger manager for multiple chargers"
 	depends on REGULATOR
 	select EXTCON
 	help
diff --git a/include/linux/power/charger-manager.h b/include/linux/power/charger-manager.h
index ad19e68..40493b2 100644
--- a/include/linux/power/charger-manager.h
+++ b/include/linux/power/charger-manager.h
@@ -248,11 +248,6 @@  struct charger_manager {
 	u64 charging_end_time;
 };
 
-#ifdef CONFIG_CHARGER_MANAGER
 extern void cm_notify_event(struct power_supply *psy,
-				enum cm_event_types type, char *msg);
-#else
-static inline void cm_notify_event(struct power_supply *psy,
-				enum cm_event_types type, char *msg) { }
-#endif
+			    enum cm_event_types type, char *msg);
 #endif /* _CHARGER_MANAGER_H */