| Message ID | 20230105134622.254560-17-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/27] ARM: pxa: remove unused board files | expand |
Hi, On Thu, Jan 05, 2023 at 02:46:11PM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > This driver was used for a couple of Intel PXA and Samsung S3C24xx > based PDAs, but all of those are now removed from the kernel, so > the driver itself is no longer useful. > > Cc: Sebastian Reichel <sre@kernel.org> > Cc: Anton Vorontsov <cbou@mail.ru> > Cc: linux-pm@vger.kernel.org > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- This needs to go through the same tree as the patch removing the PXA boards, since they include pda_power.h: Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com> -- Sebastian > Documentation/power/power_supply_class.rst | 4 +- > arch/arm/mach-tegra/tegra.c | 1 - > drivers/power/supply/Kconfig | 9 - > drivers/power/supply/Makefile | 1 - > drivers/power/supply/pda_power.c | 520 --------------------- > include/linux/pda_power.h | 39 -- > 6 files changed, 2 insertions(+), 572 deletions(-) > delete mode 100644 drivers/power/supply/pda_power.c > delete mode 100644 include/linux/pda_power.h > > diff --git a/Documentation/power/power_supply_class.rst b/Documentation/power/power_supply_class.rst > index c04fabee0a58..da8e275a14ff 100644 > --- a/Documentation/power/power_supply_class.rst > +++ b/Documentation/power/power_supply_class.rst > @@ -40,8 +40,8 @@ kind of power supply, and can process/present them to a user in consistent > manner. Results for different power supplies and machines are also directly > comparable. > > -See drivers/power/supply/ds2760_battery.c and drivers/power/supply/pda_power.c > -for the example how to declare and handle attributes. > +See drivers/power/supply/ds2760_battery.c for the example how to declare > +and handle attributes. > > > Units > diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c > index ab5008f35803..9ef1dfa7b926 100644 > --- a/arch/arm/mach-tegra/tegra.c > +++ b/arch/arm/mach-tegra/tegra.c > @@ -19,7 +19,6 @@ > #include <linux/of_fdt.h> > #include <linux/of.h> > #include <linux/of_platform.h> > -#include <linux/pda_power.h> > #include <linux/platform_device.h> > #include <linux/serial_8250.h> > #include <linux/slab.h> > diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig > index 3c37f3a6431c..e2f8dfcdd2a9 100644 > --- a/drivers/power/supply/Kconfig > +++ b/drivers/power/supply/Kconfig > @@ -28,15 +28,6 @@ config POWER_SUPPLY_HWMON > Say 'Y' here if you want power supplies to > have hwmon sysfs interface too. > > - > -config PDA_POWER > - tristate "Generic PDA/phone power driver" > - depends on !S390 > - help > - Say Y here to enable generic power driver for PDAs and phones with > - one or two external power supplies (AC/USB) connected to main and > - backup batteries, and optional builtin charger. > - > config APM_POWER > tristate "APM emulation for class batteries" > depends on APM_EMULATION > diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile > index 55c1aae91d1d..8cb3c7f5c111 100644 > --- a/drivers/power/supply/Makefile > +++ b/drivers/power/supply/Makefile > @@ -9,7 +9,6 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o > obj-$(CONFIG_POWER_SUPPLY_HWMON) += power_supply_hwmon.o > obj-$(CONFIG_GENERIC_ADC_BATTERY) += generic-adc-battery.o > > -obj-$(CONFIG_PDA_POWER) += pda_power.o > obj-$(CONFIG_APM_POWER) += apm_power.o > obj-$(CONFIG_AXP20X_POWER) += axp20x_usb_power.o > obj-$(CONFIG_IP5XXX_POWER) += ip5xxx_power.o > diff --git a/drivers/power/supply/pda_power.c b/drivers/power/supply/pda_power.c > deleted file mode 100644 > index 03a37fd6be27..000000000000 > diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h > deleted file mode 100644 > index 2a69db4b60b7..000000000000 > -- > 2.39.0 >
diff --git a/Documentation/power/power_supply_class.rst b/Documentation/power/power_supply_class.rst index c04fabee0a58..da8e275a14ff 100644 --- a/Documentation/power/power_supply_class.rst +++ b/Documentation/power/power_supply_class.rst @@ -40,8 +40,8 @@ kind of power supply, and can process/present them to a user in consistent manner. Results for different power supplies and machines are also directly comparable. -See drivers/power/supply/ds2760_battery.c and drivers/power/supply/pda_power.c -for the example how to declare and handle attributes. +See drivers/power/supply/ds2760_battery.c for the example how to declare +and handle attributes. Units diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c index ab5008f35803..9ef1dfa7b926 100644 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mach-tegra/tegra.c @@ -19,7 +19,6 @@ #include <linux/of_fdt.h> #include <linux/of.h> #include <linux/of_platform.h> -#include <linux/pda_power.h> #include <linux/platform_device.h> #include <linux/serial_8250.h> #include <linux/slab.h> diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig index 3c37f3a6431c..e2f8dfcdd2a9 100644 --- a/drivers/power/supply/Kconfig +++ b/drivers/power/supply/Kconfig @@ -28,15 +28,6 @@ config POWER_SUPPLY_HWMON Say 'Y' here if you want power supplies to have hwmon sysfs interface too. - -config PDA_POWER - tristate "Generic PDA/phone power driver" - depends on !S390 - help - Say Y here to enable generic power driver for PDAs and phones with - one or two external power supplies (AC/USB) connected to main and - backup batteries, and optional builtin charger. - config APM_POWER tristate "APM emulation for class batteries" depends on APM_EMULATION diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile index 55c1aae91d1d..8cb3c7f5c111 100644 --- a/drivers/power/supply/Makefile +++ b/drivers/power/supply/Makefile @@ -9,7 +9,6 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o obj-$(CONFIG_POWER_SUPPLY_HWMON) += power_supply_hwmon.o obj-$(CONFIG_GENERIC_ADC_BATTERY) += generic-adc-battery.o -obj-$(CONFIG_PDA_POWER) += pda_power.o obj-$(CONFIG_APM_POWER) += apm_power.o obj-$(CONFIG_AXP20X_POWER) += axp20x_usb_power.o obj-$(CONFIG_IP5XXX_POWER) += ip5xxx_power.o diff --git a/drivers/power/supply/pda_power.c b/drivers/power/supply/pda_power.c deleted file mode 100644 index 03a37fd6be27..000000000000 diff --git a/include/linux/pda_power.h b/include/linux/pda_power.h deleted file mode 100644 index 2a69db4b60b7..000000000000