Hi,
On Sun, May 14, 2023 at 02:31:27PM +0200, Jakob Hauser wrote:
> Move struct rt5033_battery from the mfd header into the battery driver because
> it's not used by others.
>
> Within struct rt5033_battery, remove the line "struct rt5033_dev *rt5033;"
> because it doesn't get used.
>
> In rt5033.h, remove #include <linux/power_supply.h>, it's not necessary
> anymore.
>
> In rt5033_battery.c, remove #include <linux/mfd/rt5033.h>, it's not necessary
> anymore either. Instead add #include <linux/regmap.h> and
>
> Signed-off-by: Jakob Hauser <jahau@xxxxxxxxxxxxxx>
> ---
Acked-by: Sebastian Reichel <sebastian.reichel@xxxxxxxxxxxxx>
-- Sebastian
> drivers/power/supply/rt5033_battery.c | 9 ++++++++-
> include/linux/mfd/rt5033.h | 8 --------
> 2 files changed, 8 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/power/supply/rt5033_battery.c b/drivers/power/supply/rt5033_battery.c
> index 5c04cf305219..91e1efd81f69 100644
> --- a/drivers/power/supply/rt5033_battery.c
> +++ b/drivers/power/supply/rt5033_battery.c
> @@ -6,11 +6,18 @@
> * Author: Beomho Seo <beomho.seo@xxxxxxxxxxx>
> */
>
> +#include <linux/i2c.h>
> #include <linux/module.h>
> #include <linux/platform_device.h>
> #include <linux/power_supply.h>
> +#include <linux/regmap.h>
> #include <linux/mfd/rt5033-private.h>
> -#include <linux/mfd/rt5033.h>
> +
> +struct rt5033_battery {
> + struct i2c_client *client;
> + struct regmap *regmap;
> + struct power_supply *psy;
> +};
>
> static int rt5033_battery_get_capacity(struct i2c_client *client)
> {
> diff --git a/include/linux/mfd/rt5033.h b/include/linux/mfd/rt5033.h
> index 3992fb2ef0a8..bb3d18945d21 100644
> --- a/include/linux/mfd/rt5033.h
> +++ b/include/linux/mfd/rt5033.h
> @@ -12,7 +12,6 @@
> #include <linux/regulator/consumer.h>
> #include <linux/i2c.h>
> #include <linux/regmap.h>
> -#include <linux/power_supply.h>
>
> /* RT5033 regulator IDs */
> enum rt5033_regulators {
> @@ -32,11 +31,4 @@ struct rt5033_dev {
> bool wakeup;
> };
>
> -struct rt5033_battery {
> - struct i2c_client *client;
> - struct rt5033_dev *rt5033;
> - struct regmap *regmap;
> - struct power_supply *psy;
> -};
> -
> #endif /* __RT5033_H__ */
> --
> 2.39.2
>
Attachment:
signature.asc
Description: PGP signature
