Patchwork Kernel 2.6.37-git10 build failure: cassini.c

login
register
mail settings
Submitter David Miller
Date Jan. 14, 2011, 8:41 p.m.
Message ID <20110114.124116.197952526.davem@davemloft.net>
Download mbox | patch
Permalink /patch/79011/
State Accepted
Delegated to: David Miller
Headers show

Comments

David Miller - Jan. 14, 2011, 8:41 p.m.
From: Anca Emanuel <anca.emanuel@gmail.com>

Date: Fri, 14 Jan 2011 10:09:43 +0200

> drivers/net/cassini.c: In function ‘cas_get_vpd_info’:

> drivers/net/cassini.c:3358: error: implicit declaration of function

> ‘of_get_property’

> drivers/net/cassini.c:3358: warning: assignment makes pointer from

> integer without a cast

> drivers/net/cassini.c: In function ‘cas_init_one’:

> drivers/net/cassini.c:5035: error: implicit declaration of function

> ‘pci_device_to_OF_node’

> drivers/net/cassini.c:5035: warning: assignment makes pointer from

> integer without a cast

> make[3]: *** [drivers/net/cassini.o] Error 1

> make[2]: *** [drivers/net] Error 2


This is the fix I'll be using:

--------------------
cassini: Fix build bustage on x86.

Unfortunately, not all CONFIG_OF platforms provide
pci_device_to_OF_node().

Change the test to CONFIG_SPARC for now to deal with
the build regressions.

Signed-off-by: David S. Miller <davem@davemloft.net>

---
 drivers/net/cassini.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.7.3.4
Grant Likely - Jan. 14, 2011, 9:01 p.m.
2011/1/14 David Miller <davem@davemloft.net>:
> From: Anca Emanuel <anca.emanuel@gmail.com>
> Date: Fri, 14 Jan 2011 10:09:43 +0200
>
>> drivers/net/cassini.c: In function ‘cas_get_vpd_info’:
>> drivers/net/cassini.c:3358: error: implicit declaration of function
>> ‘of_get_property’
>> drivers/net/cassini.c:3358: warning: assignment makes pointer from
>> integer without a cast
>> drivers/net/cassini.c: In function ‘cas_init_one’:
>> drivers/net/cassini.c:5035: error: implicit declaration of function
>> ‘pci_device_to_OF_node’
>> drivers/net/cassini.c:5035: warning: assignment makes pointer from
>> integer without a cast
>> make[3]: *** [drivers/net/cassini.o] Error 1
>> make[2]: *** [drivers/net] Error 2
>
> This is the fix I'll be using:
>
> --------------------
> cassini: Fix build bustage on x86.
>
> Unfortunately, not all CONFIG_OF platforms provide
> pci_device_to_OF_node().
>
> Change the test to CONFIG_SPARC for now to deal with
> the build regressions.
>
> Signed-off-by: David S. Miller <davem@davemloft.net>

Acked-by: Grant Likely <grant.likely@secretlab.ca>

pci_device_to_OF_node() will probably become available for all
CONFIG_OF users in 2.6.39.  In the meantime, I agree with this
solution.

g.

> ---
>  drivers/net/cassini.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
> index 7206ab2..3437613 100644
> --- a/drivers/net/cassini.c
> +++ b/drivers/net/cassini.c
> @@ -3203,7 +3203,7 @@ static int cas_get_vpd_info(struct cas *cp, unsigned char *dev_addr,
>        int phy_type = CAS_PHY_MII_MDIO0; /* default phy type */
>        int mac_off  = 0;
>
> -#if defined(CONFIG_OF)
> +#if defined(CONFIG_SPARC)
>        const unsigned char *addr;
>  #endif
>
> @@ -3354,7 +3354,7 @@ use_random_mac_addr:
>        if (found & VPD_FOUND_MAC)
>                goto done;
>
> -#if defined(CONFIG_OF)
> +#if defined(CONFIG_SPARC)
>        addr = of_get_property(cp->of_node, "local-mac-address", NULL);
>        if (addr != NULL) {
>                memcpy(dev_addr, addr, 6);
> @@ -5031,7 +5031,7 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
>        cp->msg_enable = (cassini_debug < 0) ? CAS_DEF_MSG_ENABLE :
>          cassini_debug;
>
> -#if defined(CONFIG_OF)
> +#if defined(CONFIG_SPARC)
>        cp->of_node = pci_device_to_OF_node(pdev);
>  #endif
>
> --
> 1.7.3.4
>
>

Patch

diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c

index 7206ab2..3437613 100644

--- a/drivers/net/cassini.c

+++ b/drivers/net/cassini.c

@@ -3203,7 +3203,7 @@  static int cas_get_vpd_info(struct cas *cp, unsigned char *dev_addr,

 	int phy_type = CAS_PHY_MII_MDIO0; /* default phy type */
 	int mac_off  = 0;
 
-#if defined(CONFIG_OF)

+#if defined(CONFIG_SPARC)

 	const unsigned char *addr;
 #endif
 
@@ -3354,7 +3354,7 @@  use_random_mac_addr:

 	if (found & VPD_FOUND_MAC)
 		goto done;
 
-#if defined(CONFIG_OF)

+#if defined(CONFIG_SPARC)

 	addr = of_get_property(cp->of_node, "local-mac-address", NULL);
 	if (addr != NULL) {
 		memcpy(dev_addr, addr, 6);
@@ -5031,7 +5031,7 @@  static int __devinit cas_init_one(struct pci_dev *pdev,

 	cp->msg_enable = (cassini_debug < 0) ? CAS_DEF_MSG_ENABLE :
 	  cassini_debug;
 
-#if defined(CONFIG_OF)

+#if defined(CONFIG_SPARC)

 	cp->of_node = pci_device_to_OF_node(pdev);
 #endif