提交 d297c31f 编写于 作者: D David S. Miller

[TULIP]: Use pci_device_to_OF_node() on sparc.

Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 49345103
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <asm/uaccess.h> #include <asm/uaccess.h>
#ifdef CONFIG_SPARC #ifdef CONFIG_SPARC
#include <asm/pbm.h> #include <asm/prom.h>
#endif #endif
static char version[] __devinitdata = static char version[] __devinitdata =
...@@ -1536,22 +1536,18 @@ static int __devinit tulip_init_one (struct pci_dev *pdev, ...@@ -1536,22 +1536,18 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
that here as well. */ that here as well. */
if (sum == 0 || sum == 6*0xff) { if (sum == 0 || sum == 6*0xff) {
#if defined(CONFIG_SPARC) #if defined(CONFIG_SPARC)
struct pcidev_cookie *pcp = pdev->sysdata; struct device_node *dp = pci_device_to_OF_node(pdev);
const unsigned char *addr;
int len;
#endif #endif
eeprom_missing = 1; eeprom_missing = 1;
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
dev->dev_addr[i] = last_phys_addr[i]; dev->dev_addr[i] = last_phys_addr[i];
dev->dev_addr[i] = last_phys_addr[i] + 1; dev->dev_addr[i] = last_phys_addr[i] + 1;
#if defined(CONFIG_SPARC) #if defined(CONFIG_SPARC)
if (pcp) { addr = of_get_property(dp, "local-mac-address", &len);
const unsigned char *addr; if (addr && len == 6)
int len; memcpy(dev->dev_addr, addr, 6);
addr = of_get_property(pcp->prom_node,
"local-mac-address", &len);
if (addr && len == 6)
memcpy(dev->dev_addr, addr, 6);
}
#endif #endif
#if defined(__i386__) || defined(__x86_64__) /* Patch up x86 BIOS bug. */ #if defined(__i386__) || defined(__x86_64__) /* Patch up x86 BIOS bug. */
if (last_irq) if (last_irq)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册