diff mbox series

[1/9] Remove unused headers <linux/jz4740-adc.h> and <linux/power/jz4740-battery.h>

Message ID 20211102220203.940290-2-corbet@lwn.net (mailing list archive)
State Not Applicable, archived
Headers show
Series [1/9] Remove unused headers <linux/jz4740-adc.h> and <linux/power/jz4740-battery.h> | expand

Commit Message

Jonathan Corbet Nov. 2, 2021, 10:01 p.m. UTC 
Commit ff71266aa490 ("mfd: Drop obsolete JZ4740 driver") removed the last
file to include <linux/jz4740-adc.h> but left the header file itself
behind.  Nothing uses it, remove it now.

Similarly, aea12071d6fc ("power/supply: Drop obsolete JZ4740 driver")
deleted the last use of <linux/power/jz4740-battery.h>, so remove that one
too.

Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Paul Burton <paul.burton@mips.com>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
---
 include/linux/jz4740-adc.h           | 33 ----------------------------
 include/linux/power/jz4740-battery.h | 15 -------------
 2 files changed, 48 deletions(-)
 delete mode 100644 include/linux/jz4740-adc.h
 delete mode 100644 include/linux/power/jz4740-battery.h

Comments

Paul Cercueil Nov. 2, 2021, 10:19 p.m. UTC | #1 
Hi Jonathan,

Le mar., nov. 2 2021 at 16:01:55 -0600, Jonathan Corbet 
<corbet@lwn.net> a écrit :
> Commit ff71266aa490 ("mfd: Drop obsolete JZ4740 driver") removed the 
> last
> file to include <linux/jz4740-adc.h> but left the header file itself
> behind.  Nothing uses it, remove it now.
> 
> Similarly, aea12071d6fc ("power/supply: Drop obsolete JZ4740 driver")
> deleted the last use of <linux/power/jz4740-battery.h>, so remove 
> that one
> too.
> 
> Cc: Paul Cercueil <paul@crapouillou.net>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Paul Burton <paul.burton@mips.com>
> Cc: Sebastian Reichel <sre@kernel.org>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>

Acked-by: Paul Cercueil <paul@crapouillou.net>

Thanks!
-Paul

> ---
>  include/linux/jz4740-adc.h           | 33 
> ----------------------------
>  include/linux/power/jz4740-battery.h | 15 -------------
>  2 files changed, 48 deletions(-)
>  delete mode 100644 include/linux/jz4740-adc.h
>  delete mode 100644 include/linux/power/jz4740-battery.h
> 
> diff --git a/include/linux/jz4740-adc.h b/include/linux/jz4740-adc.h
> deleted file mode 100644
> index 19d995c8bf06..000000000000
> --- a/include/linux/jz4740-adc.h
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> -
> -#ifndef __LINUX_JZ4740_ADC
> -#define __LINUX_JZ4740_ADC
> -
> -struct device;
> -
> -/*
> - * jz4740_adc_set_config - Configure a JZ4740 adc device
> - * @dev: Pointer to a jz4740-adc device
> - * @mask: Mask for the config value to be set
> - * @val: Value to be set
> - *
> - * This function can be used by the JZ4740 ADC mfd cells to 
> configure their
> - * options in the shared config register.
> -*/
> -int jz4740_adc_set_config(struct device *dev, uint32_t mask, 
> uint32_t val);
> -
> -#define JZ_ADC_CONFIG_SPZZ		BIT(31)
> -#define JZ_ADC_CONFIG_EX_IN		BIT(30)
> -#define JZ_ADC_CONFIG_DNUM_MASK		(0x7 << 16)
> -#define JZ_ADC_CONFIG_DMA_ENABLE	BIT(15)
> -#define JZ_ADC_CONFIG_XYZ_MASK		(0x2 << 13)
> -#define JZ_ADC_CONFIG_SAMPLE_NUM_MASK	(0x7 << 10)
> -#define JZ_ADC_CONFIG_CLKDIV_MASK	(0xf << 5)
> -#define JZ_ADC_CONFIG_BAT_MB		BIT(4)
> -
> -#define JZ_ADC_CONFIG_DNUM(dnum)	((dnum) << 16)
> -#define JZ_ADC_CONFIG_XYZ_OFFSET(dnum)	((xyz) << 13)
> -#define JZ_ADC_CONFIG_SAMPLE_NUM(x)	((x) << 10)
> -#define JZ_ADC_CONFIG_CLKDIV(div)	((div) << 5)
> -
> -#endif
> diff --git a/include/linux/power/jz4740-battery.h 
> b/include/linux/power/jz4740-battery.h
> deleted file mode 100644
> index 10da211678c8..000000000000
> --- a/include/linux/power/jz4740-battery.h
> +++ /dev/null
> @@ -1,15 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - *  Copyright (C) 2009, Jiejing Zhang <kzjeef@gmail.com>
> - */
> -
> -#ifndef __JZ4740_BATTERY_H
> -#define __JZ4740_BATTERY_H
> -
> -struct jz_battery_platform_data {
> -	struct power_supply_info info;
> -	int gpio_charge;	/* GPIO port of Charger state */
> -	int gpio_charge_active_low;
> -};
> -
> -#endif
> --
> 2.31.1
>
Lee Jones Nov. 3, 2021, 7:43 a.m. UTC | #2 
On Tue, 02 Nov 2021, Jonathan Corbet wrote:

> Commit ff71266aa490 ("mfd: Drop obsolete JZ4740 driver") removed the last
> file to include <linux/jz4740-adc.h> but left the header file itself
> behind.  Nothing uses it, remove it now.
> 
> Similarly, aea12071d6fc ("power/supply: Drop obsolete JZ4740 driver")
> deleted the last use of <linux/power/jz4740-battery.h>, so remove that one
> too.
> 
> Cc: Paul Cercueil <paul@crapouillou.net>
> Cc: Lee Jones <lee.jones@linaro.org>
> Cc: Paul Burton <paul.burton@mips.com>
> Cc: Sebastian Reichel <sre@kernel.org>
> Cc: linux-pm@vger.kernel.org
> Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> ---
>  include/linux/jz4740-adc.h           | 33 ----------------------------
>  include/linux/power/jz4740-battery.h | 15 -------------

It appears as though there are still references to both of these
*devices* in the kernel tree.  Should those be removed also?

>  2 files changed, 48 deletions(-)
>  delete mode 100644 include/linux/jz4740-adc.h
>  delete mode 100644 include/linux/power/jz4740-battery.h

Patch looks fine though.

Let me know if you want me to take it in via MFD.  Otherwise:

Acked-by: Lee Jones <lee.jones@linaro.org>
Paul Cercueil Nov. 3, 2021, 9:27 a.m. UTC | #3 
Hi Lee,

Le mer., nov. 3 2021 at 07:43:51 +0000, Lee Jones 
<lee.jones@linaro.org> a écrit :
> On Tue, 02 Nov 2021, Jonathan Corbet wrote:
> 
>>  Commit ff71266aa490 ("mfd: Drop obsolete JZ4740 driver") removed 
>> the last
>>  file to include <linux/jz4740-adc.h> but left the header file itself
>>  behind.  Nothing uses it, remove it now.
>> 
>>  Similarly, aea12071d6fc ("power/supply: Drop obsolete JZ4740 
>> driver")
>>  deleted the last use of <linux/power/jz4740-battery.h>, so remove 
>> that one
>>  too.
>> 
>>  Cc: Paul Cercueil <paul@crapouillou.net>
>>  Cc: Lee Jones <lee.jones@linaro.org>
>>  Cc: Paul Burton <paul.burton@mips.com>
>>  Cc: Sebastian Reichel <sre@kernel.org>
>>  Cc: linux-pm@vger.kernel.org
>>  Signed-off-by: Jonathan Corbet <corbet@lwn.net>
>>  ---
>>   include/linux/jz4740-adc.h           | 33 
>> ----------------------------
>>   include/linux/power/jz4740-battery.h | 15 -------------
> 
> It appears as though there are still references to both of these
> *devices* in the kernel tree.  Should those be removed also?

These files were for older drivers that were since then replaced by 
newer drivers; JZ47xx SoCs are still officially supported and 
maintained.

Cheers,
-Paul

>>   2 files changed, 48 deletions(-)
>>   delete mode 100644 include/linux/jz4740-adc.h
>>   delete mode 100644 include/linux/power/jz4740-battery.h
> 
> Patch looks fine though.
> 
> Let me know if you want me to take it in via MFD.  Otherwise:
> 
> Acked-by: Lee Jones <lee.jones@linaro.org>
> 
> --
> Lee Jones [李琼斯]
> Senior Technical Lead - Developer Services
> Linaro.org │ Open source software for Arm SoCs
> Follow Linaro: Facebook | Twitter | Blog
Lee Jones Nov. 3, 2021, 10:13 a.m. UTC | #4 
On Wed, 03 Nov 2021, Paul Cercueil wrote:

> Hi Lee,
> 
> Le mer., nov. 3 2021 at 07:43:51 +0000, Lee Jones <lee.jones@linaro.org> a
> écrit :
> > On Tue, 02 Nov 2021, Jonathan Corbet wrote:
> > 
> > >  Commit ff71266aa490 ("mfd: Drop obsolete JZ4740 driver") removed
> > > the last
> > >  file to include <linux/jz4740-adc.h> but left the header file itself
> > >  behind.  Nothing uses it, remove it now.
> > > 
> > >  Similarly, aea12071d6fc ("power/supply: Drop obsolete JZ4740
> > > driver")
> > >  deleted the last use of <linux/power/jz4740-battery.h>, so remove
> > > that one
> > >  too.
> > > 
> > >  Cc: Paul Cercueil <paul@crapouillou.net>
> > >  Cc: Lee Jones <lee.jones@linaro.org>
> > >  Cc: Paul Burton <paul.burton@mips.com>
> > >  Cc: Sebastian Reichel <sre@kernel.org>
> > >  Cc: linux-pm@vger.kernel.org
> > >  Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> > >  ---
> > >   include/linux/jz4740-adc.h           | 33
> > > ----------------------------
> > >   include/linux/power/jz4740-battery.h | 15 -------------
> > 
> > It appears as though there are still references to both of these
> > *devices* in the kernel tree.  Should those be removed also?
> 
> These files were for older drivers that were since then replaced by newer
> drivers; JZ47xx SoCs are still officially supported and maintained.

Okay, great.

Thanks for the explanation Paul.
Sebastian Reichel Nov. 3, 2021, 12:40 p.m. UTC | #5 
Hi,

On Wed, Nov 03, 2021 at 07:43:51AM +0000, Lee Jones wrote:
> On Tue, 02 Nov 2021, Jonathan Corbet wrote:
> > Commit ff71266aa490 ("mfd: Drop obsolete JZ4740 driver") removed the last
> > file to include <linux/jz4740-adc.h> but left the header file itself
> > behind.  Nothing uses it, remove it now.
> > 
> > Similarly, aea12071d6fc ("power/supply: Drop obsolete JZ4740 driver")
> > deleted the last use of <linux/power/jz4740-battery.h>, so remove that one
> > too.

Thanks for the cleanup Jonathan.

> > Cc: Paul Cercueil <paul@crapouillou.net>
> > Cc: Lee Jones <lee.jones@linaro.org>
> > Cc: Paul Burton <paul.burton@mips.com>
> > Cc: Sebastian Reichel <sre@kernel.org>
> > Cc: linux-pm@vger.kernel.org
> > Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> > ---
> >  include/linux/jz4740-adc.h           | 33 ----------------------------
> >  include/linux/power/jz4740-battery.h | 15 -------------
> 
> It appears as though there are still references to both of these
> *devices* in the kernel tree.  Should those be removed also?
> 
> >  2 files changed, 48 deletions(-)
> >  delete mode 100644 include/linux/jz4740-adc.h
> >  delete mode 100644 include/linux/power/jz4740-battery.h
> 
> Patch looks fine though.
> 
> Let me know if you want me to take it in via MFD.  Otherwise:
> 
> Acked-by: Lee Jones <lee.jones@linaro.org>

You can take it through MFD, no immutable branch needed.

Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>

-- Sebastian
Lee Jones Nov. 4, 2021, 8:30 a.m. UTC | #6 
On Wed, 03 Nov 2021, Sebastian Reichel wrote:

> Hi,
> 
> On Wed, Nov 03, 2021 at 07:43:51AM +0000, Lee Jones wrote:
> > On Tue, 02 Nov 2021, Jonathan Corbet wrote:
> > > Commit ff71266aa490 ("mfd: Drop obsolete JZ4740 driver") removed the last
> > > file to include <linux/jz4740-adc.h> but left the header file itself
> > > behind.  Nothing uses it, remove it now.
> > > 
> > > Similarly, aea12071d6fc ("power/supply: Drop obsolete JZ4740 driver")
> > > deleted the last use of <linux/power/jz4740-battery.h>, so remove that one
> > > too.
> 
> Thanks for the cleanup Jonathan.
> 
> > > Cc: Paul Cercueil <paul@crapouillou.net>
> > > Cc: Lee Jones <lee.jones@linaro.org>
> > > Cc: Paul Burton <paul.burton@mips.com>
> > > Cc: Sebastian Reichel <sre@kernel.org>
> > > Cc: linux-pm@vger.kernel.org
> > > Signed-off-by: Jonathan Corbet <corbet@lwn.net>
> > > ---
> > >  include/linux/jz4740-adc.h           | 33 ----------------------------
> > >  include/linux/power/jz4740-battery.h | 15 -------------
> > 
> > It appears as though there are still references to both of these
> > *devices* in the kernel tree.  Should those be removed also?
> > 
> > >  2 files changed, 48 deletions(-)
> > >  delete mode 100644 include/linux/jz4740-adc.h
> > >  delete mode 100644 include/linux/power/jz4740-battery.h
> > 
> > Patch looks fine though.
> > 
> > Let me know if you want me to take it in via MFD.  Otherwise:
> > 
> > Acked-by: Lee Jones <lee.jones@linaro.org>
> 
> You can take it through MFD, no immutable branch needed.
> 
> Acked-by: Sebastian Reichel <sebastian.reichel@collabora.com>

Okay, no problem.

Since the merge-window is already open, we'll aim for v5.17.
diff mbox series

Patch

diff --git a/include/linux/jz4740-adc.h b/include/linux/jz4740-adc.h
deleted file mode 100644
index 19d995c8bf06..000000000000
--- a/include/linux/jz4740-adc.h
+++ /dev/null
@@ -1,33 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0 */
-
-#ifndef __LINUX_JZ4740_ADC
-#define __LINUX_JZ4740_ADC
-
-struct device;
-
-/*
- * jz4740_adc_set_config - Configure a JZ4740 adc device
- * @dev: Pointer to a jz4740-adc device
- * @mask: Mask for the config value to be set
- * @val: Value to be set
- *
- * This function can be used by the JZ4740 ADC mfd cells to configure their
- * options in the shared config register.
-*/
-int jz4740_adc_set_config(struct device *dev, uint32_t mask, uint32_t val);
-
-#define JZ_ADC_CONFIG_SPZZ		BIT(31)
-#define JZ_ADC_CONFIG_EX_IN		BIT(30)
-#define JZ_ADC_CONFIG_DNUM_MASK		(0x7 << 16)
-#define JZ_ADC_CONFIG_DMA_ENABLE	BIT(15)
-#define JZ_ADC_CONFIG_XYZ_MASK		(0x2 << 13)
-#define JZ_ADC_CONFIG_SAMPLE_NUM_MASK	(0x7 << 10)
-#define JZ_ADC_CONFIG_CLKDIV_MASK	(0xf << 5)
-#define JZ_ADC_CONFIG_BAT_MB		BIT(4)
-
-#define JZ_ADC_CONFIG_DNUM(dnum)	((dnum) << 16)
-#define JZ_ADC_CONFIG_XYZ_OFFSET(dnum)	((xyz) << 13)
-#define JZ_ADC_CONFIG_SAMPLE_NUM(x)	((x) << 10)
-#define JZ_ADC_CONFIG_CLKDIV(div)	((div) << 5)
-
-#endif
diff --git a/include/linux/power/jz4740-battery.h b/include/linux/power/jz4740-battery.h
deleted file mode 100644
index 10da211678c8..000000000000
--- a/include/linux/power/jz4740-battery.h
+++ /dev/null
@@ -1,15 +0,0 @@ 
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- *  Copyright (C) 2009, Jiejing Zhang <kzjeef@gmail.com>
- */
-
-#ifndef __JZ4740_BATTERY_H
-#define __JZ4740_BATTERY_H
-
-struct jz_battery_platform_data {
-	struct power_supply_info info;
-	int gpio_charge;	/* GPIO port of Charger state */
-	int gpio_charge_active_low;
-};
-
-#endif