[PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Geert Uytterhoeven]

On m68k, I get:

drivers/i2c/busses/i2c-elektor.c: In function ‘pcf_isa_init’:
drivers/i2c/busses/i2c-elektor.c:153: error: implicit declaration of function ‘ioport_map’
drivers/i2c/busses/i2c-elektor.c:153: warning: assignment makes pointer from integer without a cast
drivers/i2c/busses/i2c-elektor.c: In function ‘elektor_probe’:
drivers/i2c/busses/i2c-elektor.c:287: error: implicit declaration of function ‘ioport_unmap’

Since commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f ("iomap: make IOPORT/PCI
mapping functions conditional"), ioport_map() is only available on platforms
that set HAS_IOPORT.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 drivers/i2c/busses/Kconfig |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 646068e..d1fc5cf 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -789,7 +789,7 @@ config I2C_ACORN
 
 config I2C_ELEKTOR
 	tristate "Elektor ISA card"
-	depends on ISA && BROKEN_ON_SMP
+	depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
 	select I2C_ALGOPCF
 	help
 	  This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
-- 
1.7.0.4

Re: [PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Jean Delvare]

Hi Geert,

On Mon,  8 Aug 2011 13:20:46 +0200, Geert Uytterhoeven wrote:
> On m68k, I get:
> 
> drivers/i2c/busses/i2c-elektor.c: In function ‘pcf_isa_init’:
> drivers/i2c/busses/i2c-elektor.c:153: error: implicit declaration of function ‘ioport_map’
> drivers/i2c/busses/i2c-elektor.c:153: warning: assignment makes pointer from integer without a cast
> drivers/i2c/busses/i2c-elektor.c: In function ‘elektor_probe’:
> drivers/i2c/busses/i2c-elektor.c:287: error: implicit declaration of function ‘ioport_unmap’
> 
> Since commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f ("iomap: make IOPORT/PCI
> mapping functions conditional"), ioport_map() is only available on platforms
> that set HAS_IOPORT.
> 
> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> ---
>  drivers/i2c/busses/Kconfig |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> index 646068e..d1fc5cf 100644
> --- a/drivers/i2c/busses/Kconfig
> +++ b/drivers/i2c/busses/Kconfig
> @@ -789,7 +789,7 @@ config I2C_ACORN
>  
>  config I2C_ELEKTOR
>  	tristate "Elektor ISA card"
> -	depends on ISA && BROKEN_ON_SMP
> +	depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
>  	select I2C_ALGOPCF
>  	help
>  	  This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own

How can ISA be set if HAS_IOPORT is not? This shouldn't be allowed.

-- 
Jean Delvare

Re: [PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Geert Uytterhoeven]

Hi Jean,

On Tue, Aug 16, 2011 at 19:50, Jean Delvare <khali@linux-fr.org> wrote:
> On Mon,  8 Aug 2011 13:20:46 +0200, Geert Uytterhoeven wrote:
>> drivers/i2c/busses/i2c-elektor.c: In function ‘pcf_isa_init’:
>> drivers/i2c/busses/i2c-elektor.c:153: error: implicit declaration of function ‘ioport_map’
>> drivers/i2c/busses/i2c-elektor.c:153: warning: assignment makes pointer from integer without a cast
>> drivers/i2c/busses/i2c-elektor.c: In function ‘elektor_probe’:
>> drivers/i2c/busses/i2c-elektor.c:287: error: implicit declaration of function ‘ioport_unmap’
>>
>> Since commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f ("iomap: make IOPORT/PCI
>> mapping functions conditional"), ioport_map() is only available on platforms
>> that set HAS_IOPORT.
>>
>> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> ---
>>  drivers/i2c/busses/Kconfig |    2 +-
>>  1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
>> index 646068e..d1fc5cf 100644
>> --- a/drivers/i2c/busses/Kconfig
>> +++ b/drivers/i2c/busses/Kconfig
>> @@ -789,7 +789,7 @@ config I2C_ACORN
>>
>>  config I2C_ELEKTOR
>>       tristate "Elektor ISA card"
>> -     depends on ISA && BROKEN_ON_SMP
>> +     depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
>>       select I2C_ALGOPCF
>>       help
>>         This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
>
> How can ISA be set if HAS_IOPORT is not? This shouldn't be allowed.

It's always been like that. With CONFIG_ISA, we have inb() and friends. But not
ioport_map(), which was introduced more recently.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Arnd Bergmann]

On Tuesday 16 August 2011 21:14:42 Geert Uytterhoeven wrote:
> >>  config I2C_ELEKTOR
> >>       tristate "Elektor ISA card"
> >> -     depends on ISA && BROKEN_ON_SMP
> >> +     depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
> >>       select I2C_ALGOPCF
> >>       help
> >>         This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
> >
> > How can ISA be set if HAS_IOPORT is not? This shouldn't be allowed.
> 
> It's always been like that. With CONFIG_ISA, we have inb() and friends. But not
> ioport_map(), which was introduced more recently.

Right. BTW, I'd really like to change that once I've picked up and fixed the
use of inb() in 8250.c. I think we should change CONFIG_HAS_IOPORT to mean
that inb(), ioport_resource and /proc/ioports are available, while a new
CONFIG_HAS_IOPORT_MAP can then replace the current CONFIG_HAS_IOPORT symbol.

	Arnd

Re: [PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Jean Delvare]

On Tue, 16 Aug 2011 21:14:42 +0200, Geert Uytterhoeven wrote:
> Hi Jean,
> 
> On Tue, Aug 16, 2011 at 19:50, Jean Delvare <khali@linux-fr.org> wrote:
> > On Mon,  8 Aug 2011 13:20:46 +0200, Geert Uytterhoeven wrote:
> >> drivers/i2c/busses/i2c-elektor.c: In function ‘pcf_isa_init’:
> >> drivers/i2c/busses/i2c-elektor.c:153: error: implicit declaration of function ‘ioport_map’
> >> drivers/i2c/busses/i2c-elektor.c:153: warning: assignment makes pointer from integer without a cast
> >> drivers/i2c/busses/i2c-elektor.c: In function ‘elektor_probe’:
> >> drivers/i2c/busses/i2c-elektor.c:287: error: implicit declaration of function ‘ioport_unmap’
> >>
> >> Since commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f ("iomap: make IOPORT/PCI
> >> mapping functions conditional"), ioport_map() is only available on platforms
> >> that set HAS_IOPORT.
> >>
> >> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
> >> ---
> >>  drivers/i2c/busses/Kconfig |    2 +-
> >>  1 files changed, 1 insertions(+), 1 deletions(-)
> >>
> >> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
> >> index 646068e..d1fc5cf 100644
> >> --- a/drivers/i2c/busses/Kconfig
> >> +++ b/drivers/i2c/busses/Kconfig
> >> @@ -789,7 +789,7 @@ config I2C_ACORN
> >>
> >>  config I2C_ELEKTOR
> >>       tristate "Elektor ISA card"
> >> -     depends on ISA && BROKEN_ON_SMP
> >> +     depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
> >>       select I2C_ALGOPCF
> >>       help
> >>         This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
> >
> > How can ISA be set if HAS_IOPORT is not? This shouldn't be allowed.
> 
> It's always been like that. With CONFIG_ISA, we have inb() and friends. But not
> ioport_map(), which was introduced more recently.

OK, fair enough. Patch applied, thanks.

-- 
Jean Delvare

Re: [PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Geert Uytterhoeven]

On Wed, Aug 17, 2011 at 11:39, Jean Delvare <khali@linux-fr.org> wrote:
> On Tue, 16 Aug 2011 21:14:42 +0200, Geert Uytterhoeven wrote:
>> On Tue, Aug 16, 2011 at 19:50, Jean Delvare <khali@linux-fr.org> wrote:
>> > On Mon,  8 Aug 2011 13:20:46 +0200, Geert Uytterhoeven wrote:
>> >> drivers/i2c/busses/i2c-elektor.c: In function ‘pcf_isa_init’:
>> >> drivers/i2c/busses/i2c-elektor.c:153: error: implicit declaration of function ‘ioport_map’
>> >> drivers/i2c/busses/i2c-elektor.c:153: warning: assignment makes pointer from integer without a cast
>> >> drivers/i2c/busses/i2c-elektor.c: In function ‘elektor_probe’:
>> >> drivers/i2c/busses/i2c-elektor.c:287: error: implicit declaration of function ‘ioport_unmap’
>> >>
>> >> Since commit 82ed223c264def2b15ee4bec2e8c3048092ceb5f ("iomap: make IOPORT/PCI
>> >> mapping functions conditional"), ioport_map() is only available on platforms
>> >> that set HAS_IOPORT.
>> >>
>> >> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>> >> ---
>> >>  drivers/i2c/busses/Kconfig |    2 +-
>> >>  1 files changed, 1 insertions(+), 1 deletions(-)
>> >>
>> >> diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
>> >> index 646068e..d1fc5cf 100644
>> >> --- a/drivers/i2c/busses/Kconfig
>> >> +++ b/drivers/i2c/busses/Kconfig
>> >> @@ -789,7 +789,7 @@ config I2C_ACORN
>> >>
>> >>  config I2C_ELEKTOR
>> >>       tristate "Elektor ISA card"
>> >> -     depends on ISA && BROKEN_ON_SMP
>> >> +     depends on ISA && HAS_IOPORT && BROKEN_ON_SMP
>> >>       select I2C_ALGOPCF
>> >>       help
>> >>         This supports the PCF8584 ISA bus I2C adapter.  Say Y if you own
>> >
>> > How can ISA be set if HAS_IOPORT is not? This shouldn't be allowed.
>>
>> It's always been like that. With CONFIG_ISA, we have inb() and friends. But not
>> ioport_map(), which was introduced more recently.
>
> OK, fair enough. Patch applied, thanks.

Any chance it will finds its way in 3.1, since it's still breaking
m68k allmodconfig
builds.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Jean Delvare]

Hi Geert,

On Mon, 29 Aug 2011 09:48:17 +0200, Geert Uytterhoeven wrote:
> On Wed, Aug 17, 2011 at 11:39, Jean Delvare <khali@linux-fr.org> wrote:
> > OK, fair enough. Patch applied, thanks.
> 
> Any chance it will finds its way in 3.1, since it's still breaking
> m68k allmodconfig builds.

This is the plan, yes. It should happen by the end of the week.

-- 
Jean Delvare

Re: [PATCH] i2c: I2C_ELEKTOR should depend on HAS_IOPORT

[Geert Uytterhoeven]

Hi Jean,

On Mon, Aug 29, 2011 at 09:55, Jean Delvare <khali@linux-fr.org> wrote:
> On Mon, 29 Aug 2011 09:48:17 +0200, Geert Uytterhoeven wrote:
>> On Wed, Aug 17, 2011 at 11:39, Jean Delvare <khali@linux-fr.org> wrote:
>> > OK, fair enough. Patch applied, thanks.
>>
>> Any chance it will finds its way in 3.1, since it's still breaking
>> m68k allmodconfig builds.
>
> This is the plan, yes. It should happen by the end of the week.

Great, thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds