[patch 2/2] drivers/net/stmmac/: add HAS_IOMEM dependency

[patch 2/2] drivers/net/stmmac/: add HAS_IOMEM dependency

[akpm]

From: Martin Schwidefsky <schwidefsky@de.ibm.com>

The stmmac driver does not compile on s390:

drivers/net/stmmac/stmmac_main.c: In function 'stmmac_adjust_link':
drivers/net/stmmac/stmmac_main.c:210: error: implicit declaration of function 'readl'
drivers/net/stmmac/stmmac_main.c:263: error: implicit declaration of function 'writel'
drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe':
drivers/net/stmmac/stmmac_main.c:1674: error: implicit declaration of function 'ioremap'
drivers/net/stmmac/stmmac_main.c:1674: warning: assignment makes pointer from integer without a cast
drivers/net/stmmac/stmmac_main.c:1761: error: implicit declaration of function 'iounmap'
make[3]: *** [drivers/net/stmmac/stmmac_main.o] Error 1

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/net/stmmac/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/net/stmmac/Kconfig~drivers-net-stmmac-add-has_iomem-dependency drivers/net/stmmac/Kconfig
--- a/drivers/net/stmmac/Kconfig~drivers-net-stmmac-add-has_iomem-dependency
+++ a/drivers/net/stmmac/Kconfig
@@ -3,7 +3,7 @@ config STMMAC_ETH
 	select MII
 	select PHYLIB
 	select CRC32
-	depends on NETDEVICES
+	depends on NETDEVICES && HAS_IOMEM
 	help
 	  This is the driver for the Ethernet IPs are built around a
 	  Synopsys IP Core and only tested on the STMicroelectronics
_

Re: [patch 2/2] drivers/net/stmmac/: add HAS_IOMEM dependency

[David Miller]

From: akpm@linux-foundation.org
Date: Fri, 01 Oct 2010 14:17:13 -0700

> From: Martin Schwidefsky <schwidefsky@de.ibm.com>
> 
> The stmmac driver does not compile on s390:
> 
> drivers/net/stmmac/stmmac_main.c: In function 'stmmac_adjust_link':
> drivers/net/stmmac/stmmac_main.c:210: error: implicit declaration of function 'readl'
> drivers/net/stmmac/stmmac_main.c:263: error: implicit declaration of function 'writel'
> drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe':
> drivers/net/stmmac/stmmac_main.c:1674: error: implicit declaration of function 'ioremap'
> drivers/net/stmmac/stmmac_main.c:1674: warning: assignment makes pointer from integer without a cast
> drivers/net/stmmac/stmmac_main.c:1761: error: implicit declaration of function 'iounmap'
> make[3]: *** [drivers/net/stmmac/stmmac_main.o] Error 1
> 
> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Cc: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
> Cc: David S. Miller <davem@davemloft.net>
> Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

This got fixed by adding a dependency on CPU_SUBTYPE_ST40.

Re: [patch 2/2] drivers/net/stmmac/: add HAS_IOMEM dependency

[Peppe CAVALLARO]

Hello

On 10/04/2010 07:00 AM, David Miller wrote:
> From: akpm@linux-foundation.org
> Date: Fri, 01 Oct 2010 14:17:13 -0700
> 
>  > From: Martin Schwidefsky <schwidefsky@de.ibm.com>
>  >
>  > The stmmac driver does not compile on s390:
>  >
>  > drivers/net/stmmac/stmmac_main.c: In function 'stmmac_adjust_link':
>  > drivers/net/stmmac/stmmac_main.c:210: error: implicit declaration of function 
> 'readl'
>  > drivers/net/stmmac/stmmac_main.c:263: error: implicit declaration of function 
> 'writel'
>  > drivers/net/stmmac/stmmac_main.c: In function 'stmmac_dvr_probe':
>  > drivers/net/stmmac/stmmac_main.c:1674: error: implicit declaration of 
> function 'ioremap'
>  > drivers/net/stmmac/stmmac_main.c:1674: warning: assignment makes pointer from 
> integer without a cast
>  > drivers/net/stmmac/stmmac_main.c:1761: error: implicit declaration of 
> function 'iounmap'
>  > make[3]: *** [drivers/net/stmmac/stmmac_main.o] Error 1
>  >
>  > Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
>  > Cc: Giuseppe CAVALLARO <peppe.cavallaro@st.com>
>  > Cc: David S. Miller <davem@davemloft.net>
>  > Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
>  > Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
> 
> This got fixed by adding a dependency on CPU_SUBTYPE_ST40.

This dependency was removed in driver included in net-next Git (because
the CPU_SUBTYPE_ST40 is a dead option).

I've seen that other drivers depend on HAS_IOMEM that is always  defined
for STM and ARM targets (where the I know the stmmac is used); No
problem for me to add this new dependency to in HAS_IOMEM the stmmac's
Kconfig if actually needed.

Regards
Peppe

Re: [patch 2/2] drivers/net/stmmac/: add HAS_IOMEM dependency

[David Miller]

From: Peppe CAVALLARO <peppe.cavallaro@st.com>
Date: Tue, 5 Oct 2010 12:46:49 +0200

> This dependency was removed in driver included in net-next Git (because
> the CPU_SUBTYPE_ST40 is a dead option).

Oh yes, I missed that.  Thanks for noticing.

> I've seen that other drivers depend on HAS_IOMEM that is always  defined
> for STM and ARM targets (where the I know the stmmac is used); No
> problem for me to add this new dependency to in HAS_IOMEM the stmmac's
> Kconfig if actually needed.

I'll add the patch Andrew posted, it is needed now.

Thanks again.