[PATCH v5 07/44] counter: add HAS_IOPORT_MAP dependency

[PATCH v5 07/44] counter: add HAS_IOPORT_MAP dependency

[Niklas Schnelle]

The 104_QUAD_8 counter driver uses devm_ioport_map() without depending
on HAS_IOPORT_MAP. This means the driver is not usable on platforms such
as s390 which do not support I/O port mapping. Add the missing
HAS_IOPORT_MAP dependency to make this explicit.

Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
 drivers/counter/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig
index 4228be917038..e65a2bf178b8 100644
--- a/drivers/counter/Kconfig
+++ b/drivers/counter/Kconfig
@@ -15,6 +15,7 @@ if COUNTER
 config 104_QUAD_8
 	tristate "ACCES 104-QUAD-8 driver"
 	depends on (PC104 && X86) || COMPILE_TEST
+	depends on HAS_IOPORT_MAP
 	select ISA_BUS_API
 	help
 	  Say yes here to build support for the ACCES 104-QUAD-8 quadrature
-- 
2.39.2

[PATCH v5 14/44] iio: ad7606: Kconfig: add HAS_IOPORT dependencies

[Niklas Schnelle]

In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
not being declared. We thus need to add HAS_IOPORT as dependency for
those drivers using them.

Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Co-developed-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@kernel.org>
Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
---
 drivers/iio/adc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index eb2b09ef5d5b..53098aca06ea 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -145,7 +145,7 @@ config AD7606
 
 config AD7606_IFACE_PARALLEL
 	tristate "Analog Devices AD7606 ADC driver with parallel interface support"
-	depends on HAS_IOMEM
+	depends on HAS_IOPORT
 	select AD7606
 	help
 	  Say yes here to build parallel interface support for Analog Devices:
-- 
2.39.2

Re: [PATCH v5 14/44] iio: ad7606: Kconfig: add HAS_IOPORT dependencies

[Jonathan Cameron]

On Mon, 22 May 2023 12:50:19 +0200
Niklas Schnelle <schnelle@linux.ibm.com> wrote:

> In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
> not being declared. We thus need to add HAS_IOPORT as dependency for
> those drivers using them.
> 
> Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Co-developed-by: Arnd Bergmann <arnd@kernel.org>
> Signed-off-by: Arnd Bergmann <arnd@kernel.org>
> Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>

I already picked this up for the IIO tree already as I don't think there are
any dependencies.

Jonathan

> ---
>  drivers/iio/adc/Kconfig | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
> index eb2b09ef5d5b..53098aca06ea 100644
> --- a/drivers/iio/adc/Kconfig
> +++ b/drivers/iio/adc/Kconfig
> @@ -145,7 +145,7 @@ config AD7606
>  
>  config AD7606_IFACE_PARALLEL
>  	tristate "Analog Devices AD7606 ADC driver with parallel interface support"
> -	depends on HAS_IOMEM
> +	depends on HAS_IOPORT
>  	select AD7606
>  	help
>  	  Say yes here to build parallel interface support for Analog Devices:

Re: [PATCH v5 14/44] iio: ad7606: Kconfig: add HAS_IOPORT dependencies

[Niklas Schnelle]

On Sun, 2023-05-28 at 19:55 +0100, Jonathan Cameron wrote:
> On Mon, 22 May 2023 12:50:19 +0200
> Niklas Schnelle <schnelle@linux.ibm.com> wrote:
> 
> > In a future patch HAS_IOPORT=n will result in inb()/outb() and friends
> > not being declared. We thus need to add HAS_IOPORT as dependency for
> > those drivers using them.
> > 
> > Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> > Co-developed-by: Arnd Bergmann <arnd@kernel.org>
> > Signed-off-by: Arnd Bergmann <arnd@kernel.org>
> > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
> 
> I already picked this up for the IIO tree already as I don't think there are
> any dependencies.
> 
> Jonathan
> 
> 

Yes thanks, I only resent it as part of this series such that applying
the series on a current -rc directly does not break the last commit. In
the future I'll sent remaining patches per-subsystem and based on
linux-next so I won't have to resent those patches that have already
been applied.

Thanks,
Niklas

Re: [PATCH v5 07/44] counter: add HAS_IOPORT_MAP dependency

[William Breathitt Gray]

[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]

On Mon, May 22, 2023 at 12:50:12PM +0200, Niklas Schnelle wrote:
> The 104_QUAD_8 counter driver uses devm_ioport_map() without depending
> on HAS_IOPORT_MAP. This means the driver is not usable on platforms such
> as s390 which do not support I/O port mapping. Add the missing
> HAS_IOPORT_MAP dependency to make this explicit.
> 
> Co-developed-by: Arnd Bergmann <arnd@kernel.org>
> Signed-off-by: Arnd Bergmann <arnd@kernel.org>
> Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
> ---
>  drivers/counter/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig
> index 4228be917038..e65a2bf178b8 100644
> --- a/drivers/counter/Kconfig
> +++ b/drivers/counter/Kconfig
> @@ -15,6 +15,7 @@ if COUNTER
>  config 104_QUAD_8
>  	tristate "ACCES 104-QUAD-8 driver"
>  	depends on (PC104 && X86) || COMPILE_TEST
> +	depends on HAS_IOPORT_MAP
>  	select ISA_BUS_API
>  	help
>  	  Say yes here to build support for the ACCES 104-QUAD-8 quadrature
> -- 
> 2.39.2
> 

This has a minor merge conflict with the current Kconfig in the Counter
tree. Would you rebase on the counter-next branch and resubmit?

Thanks,

William Breathitt Gray

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

Re: [PATCH v5 07/44] counter: add HAS_IOPORT_MAP dependency

[Niklas Schnelle]

On Thu, 2023-06-08 at 10:59 -0400, William Breathitt Gray wrote:
> On Mon, May 22, 2023 at 12:50:12PM +0200, Niklas Schnelle wrote:
> > The 104_QUAD_8 counter driver uses devm_ioport_map() without depending
> > on HAS_IOPORT_MAP. This means the driver is not usable on platforms such
> > as s390 which do not support I/O port mapping. Add the missing
> > HAS_IOPORT_MAP dependency to make this explicit.
> > 
> > Co-developed-by: Arnd Bergmann <arnd@kernel.org>
> > Signed-off-by: Arnd Bergmann <arnd@kernel.org>
> > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
> > ---
> >  drivers/counter/Kconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/drivers/counter/Kconfig b/drivers/counter/Kconfig
> > index 4228be917038..e65a2bf178b8 100644
> > --- a/drivers/counter/Kconfig
> > +++ b/drivers/counter/Kconfig
> > @@ -15,6 +15,7 @@ if COUNTER
> >  config 104_QUAD_8
> >  	tristate "ACCES 104-QUAD-8 driver"
> >  	depends on (PC104 && X86) || COMPILE_TEST
> > +	depends on HAS_IOPORT_MAP
> >  	select ISA_BUS_API
> >  	help
> >  	  Say yes here to build support for the ACCES 104-QUAD-8 quadrature
> > -- 
> > 2.39.2
> > 
> 
> This has a minor merge conflict with the current Kconfig in the Counter
> tree. Would you rebase on the counter-next branch and resubmit?
> 
> Thanks,
> 
> William Breathitt Gray

Sure can do. That said, using a three way merge as below doe handle the
conflict correctly:

% git checkout counter/counter-next
% b4 am -P _ 'https://lore.kernel.org/all/20230522105049.1467313-8-schnelle@linux.ibm.com/'
% git am -3 v5_20230522_schnelle_counter_add_has_ioport_map_dependency.mbx