| Message ID | 20210110140200.127123-1-linus.walleij@linaro.org |
|---|---|
| State | Accepted |
| Commit | 3188677d4901fbfb7a363ab2558e0a4bc76deecb |
| Headers | show |
| Series | [1/2] power: supply: max8903: Absorb pdata header | expand |
Hi, On Sun, Jan 10, 2021 at 03:01:59PM +0100, Linus Walleij wrote: > The platform data header is not included by any other file in > the kernel but the driver itself. Decomission the stand-alone > header and absorb it into the driver itself. > > Cc: Chris Lapa <chris@lapa.com.au> > Cc: MyungJoo Ham <myungjoo.ham@samsung.com> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > --- Thanks, queued. -- Sebastian > drivers/power/supply/max8903_charger.c | 32 ++++++++++++++++++- > include/linux/power/max8903_charger.h | 43 -------------------------- > 2 files changed, 31 insertions(+), 44 deletions(-) > delete mode 100644 include/linux/power/max8903_charger.h > > diff --git a/drivers/power/supply/max8903_charger.c b/drivers/power/supply/max8903_charger.c > index 0bd39b0cc257..ab1aa7df985e 100644 > --- a/drivers/power/supply/max8903_charger.c > +++ b/drivers/power/supply/max8903_charger.c > @@ -15,7 +15,37 @@ > #include <linux/slab.h> > #include <linux/power_supply.h> > #include <linux/platform_device.h> > -#include <linux/power/max8903_charger.h> > + > +struct max8903_pdata { > + /* > + * GPIOs > + * cen, chg, flt, dcm and usus are optional. > + * dok and uok are not optional depending on the status of > + * dc_valid and usb_valid. > + */ > + int cen; /* Charger Enable input */ > + int dok; /* DC(Adapter) Power OK output */ > + int uok; /* USB Power OK output */ > + int chg; /* Charger status output */ > + int flt; /* Fault output */ > + int dcm; /* Current-Limit Mode input (1: DC, 2: USB) */ > + int usus; /* USB Suspend Input (1: suspended) */ > + > + /* > + * DC(Adapter/TA) is wired > + * When dc_valid is true, > + * dok should be valid. > + * > + * At least one of dc_valid or usb_valid should be true. > + */ > + bool dc_valid; > + /* > + * USB is wired > + * When usb_valid is true, > + * uok should be valid. > + */ > + bool usb_valid; > +}; > > struct max8903_data { > struct max8903_pdata *pdata; > diff --git a/include/linux/power/max8903_charger.h b/include/linux/power/max8903_charger.h > deleted file mode 100644 > index 02f94a1b323b..000000000000 > --- a/include/linux/power/max8903_charger.h > +++ /dev/null > @@ -1,43 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0-or-later */ > -/* > - * max8903_charger.h - Maxim 8903 USB/Adapter Charger Driver > - * > - * Copyright (C) 2011 Samsung Electronics > - * MyungJoo Ham <myungjoo.ham@samsung.com> > - */ > - > -#ifndef __MAX8903_CHARGER_H__ > -#define __MAX8903_CHARGER_H__ > - > -struct max8903_pdata { > - /* > - * GPIOs > - * cen, chg, flt, dcm and usus are optional. > - * dok and uok are not optional depending on the status of > - * dc_valid and usb_valid. > - */ > - int cen; /* Charger Enable input */ > - int dok; /* DC(Adapter) Power OK output */ > - int uok; /* USB Power OK output */ > - int chg; /* Charger status output */ > - int flt; /* Fault output */ > - int dcm; /* Current-Limit Mode input (1: DC, 2: USB) */ > - int usus; /* USB Suspend Input (1: suspended) */ > - > - /* > - * DC(Adapter/TA) is wired > - * When dc_valid is true, > - * dok should be valid. > - * > - * At least one of dc_valid or usb_valid should be true. > - */ > - bool dc_valid; > - /* > - * USB is wired > - * When usb_valid is true, > - * uok should be valid. > - */ > - bool usb_valid; > -}; > - > -#endif /* __MAX8903_CHARGER_H__ */ > -- > 2.29.2 >
diff --git a/drivers/power/supply/max8903_charger.c b/drivers/power/supply/max8903_charger.c index 0bd39b0cc257..ab1aa7df985e 100644 --- a/drivers/power/supply/max8903_charger.c +++ b/drivers/power/supply/max8903_charger.c @@ -15,7 +15,37 @@ #include <linux/slab.h> #include <linux/power_supply.h> #include <linux/platform_device.h> -#include <linux/power/max8903_charger.h> + +struct max8903_pdata { + /* + * GPIOs + * cen, chg, flt, dcm and usus are optional. + * dok and uok are not optional depending on the status of + * dc_valid and usb_valid. + */ + int cen; /* Charger Enable input */ + int dok; /* DC(Adapter) Power OK output */ + int uok; /* USB Power OK output */ + int chg; /* Charger status output */ + int flt; /* Fault output */ + int dcm; /* Current-Limit Mode input (1: DC, 2: USB) */ + int usus; /* USB Suspend Input (1: suspended) */ + + /* + * DC(Adapter/TA) is wired + * When dc_valid is true, + * dok should be valid. + * + * At least one of dc_valid or usb_valid should be true. + */ + bool dc_valid; + /* + * USB is wired + * When usb_valid is true, + * uok should be valid. + */ + bool usb_valid; +}; struct max8903_data { struct max8903_pdata *pdata; diff --git a/include/linux/power/max8903_charger.h b/include/linux/power/max8903_charger.h deleted file mode 100644 index 02f94a1b323b..000000000000 --- a/include/linux/power/max8903_charger.h +++ /dev/null @@ -1,43 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * max8903_charger.h - Maxim 8903 USB/Adapter Charger Driver - * - * Copyright (C) 2011 Samsung Electronics - * MyungJoo Ham <myungjoo.ham@samsung.com> - */ - -#ifndef __MAX8903_CHARGER_H__ -#define __MAX8903_CHARGER_H__ - -struct max8903_pdata { - /* - * GPIOs - * cen, chg, flt, dcm and usus are optional. - * dok and uok are not optional depending on the status of - * dc_valid and usb_valid. - */ - int cen; /* Charger Enable input */ - int dok; /* DC(Adapter) Power OK output */ - int uok; /* USB Power OK output */ - int chg; /* Charger status output */ - int flt; /* Fault output */ - int dcm; /* Current-Limit Mode input (1: DC, 2: USB) */ - int usus; /* USB Suspend Input (1: suspended) */ - - /* - * DC(Adapter/TA) is wired - * When dc_valid is true, - * dok should be valid. - * - * At least one of dc_valid or usb_valid should be true. - */ - bool dc_valid; - /* - * USB is wired - * When usb_valid is true, - * uok should be valid. - */ - bool usb_valid; -}; - -#endif /* __MAX8903_CHARGER_H__ */
The platform data header is not included by any other file in the kernel but the driver itself. Decomission the stand-alone header and absorb it into the driver itself. Cc: Chris Lapa <chris@lapa.com.au> Cc: MyungJoo Ham <myungjoo.ham@samsung.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- drivers/power/supply/max8903_charger.c | 32 ++++++++++++++++++- include/linux/power/max8903_charger.h | 43 -------------------------- 2 files changed, 31 insertions(+), 44 deletions(-) delete mode 100644 include/linux/power/max8903_charger.h -- 2.29.2