Hi, On Fri, Oct 21, 2022 at 10:27:40PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann > > The s3c-adc driver is removed along with the s3c24xx platform, > so the battery driver is no longer needed either. > > Signed-off-by: Arnd Bergmann > --- I suppose queuing this via power-supply will result in temporary build failures because the header is included in s3c24xx arch code. So better to merge via the same tree that is killing the arch code: Acked-by: Sebastian Reichel -- Sebastian > MAINTAINERS | 7 - > drivers/power/supply/Kconfig | 6 - > drivers/power/supply/Makefile | 1 - > drivers/power/supply/s3c_adc_battery.c | 453 ------------------------- > include/linux/s3c_adc_battery.h | 39 --- > 5 files changed, 506 deletions(-) > delete mode 100644 drivers/power/supply/s3c_adc_battery.c > delete mode 100644 include/linux/s3c_adc_battery.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 071d64e2a7ca..2caf42b0328a 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -17920,13 +17920,6 @@ S: Supported > W: http://www.ibm.com/developerworks/linux/linux390/ > F: drivers/s390/scsi/zfcp_* > > -S3C ADC BATTERY DRIVER > -M: Krzysztof Kozlowski > -L: linux-samsung-soc@vger.kernel.org > -S: Odd Fixes > -F: drivers/power/supply/s3c_adc_battery.c > -F: include/linux/s3c_adc_battery.h > - > S3C24XX SD/MMC Driver > M: Ben Dooks > L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) > diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig > index 568b3ede993a..e2f8dfcdd2a9 100644 > --- a/drivers/power/supply/Kconfig > +++ b/drivers/power/supply/Kconfig > @@ -406,12 +406,6 @@ config BATTERY_MAX1721X > Say Y here to enable support for the MAX17211/MAX17215 standalone > battery gas-gauge. > > -config BATTERY_S3C_ADC > - tristate "Battery driver for Samsung ADC based monitoring" > - depends on S3C_ADC > - help > - Say Y here to enable support for iPAQ h1930/h1940/rx1950 battery > - > config BATTERY_TWL4030_MADC > tristate "TWL4030 MADC battery driver" > depends on TWL4030_MADC > diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile > index af43866b3980..8cb3c7f5c111 100644 > --- a/drivers/power/supply/Makefile > +++ b/drivers/power/supply/Makefile > @@ -54,7 +54,6 @@ obj-$(CONFIG_BATTERY_MAX17042) += max17042_battery.o > obj-$(CONFIG_BATTERY_MAX1721X) += max1721x_battery.o > obj-$(CONFIG_BATTERY_RT5033) += rt5033_battery.o > obj-$(CONFIG_CHARGER_RT9455) += rt9455_charger.o > -obj-$(CONFIG_BATTERY_S3C_ADC) += s3c_adc_battery.o > obj-$(CONFIG_BATTERY_TWL4030_MADC) += twl4030_madc_battery.o > obj-$(CONFIG_CHARGER_88PM860X) += 88pm860x_charger.o > obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o > diff --git a/drivers/power/supply/s3c_adc_battery.c b/drivers/power/supply/s3c_adc_battery.c > deleted file mode 100644 > index 68d31a3bee48..000000000000 > diff --git a/include/linux/s3c_adc_battery.h b/include/linux/s3c_adc_battery.h > deleted file mode 100644 > index 57f982c375f8..000000000000 > -- > 2.29.2 >