[SPARC64] ebus: Convert to use pci_device_to_OF_node().
Also, we don't need to store or use the PBM so kill that from the linux_ebus. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9b1caafe09
commit
1327e9b62f
|
@ -438,11 +438,9 @@ static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p)
|
|||
|
||||
void __init ebus_init(void)
|
||||
{
|
||||
struct pci_pbm_info *pbm;
|
||||
struct linux_ebus_device *dev;
|
||||
struct linux_ebus *ebus;
|
||||
struct pci_dev *pdev;
|
||||
struct pcidev_cookie *cookie;
|
||||
struct device_node *dp;
|
||||
int is_rio;
|
||||
int num_ebus = 0;
|
||||
|
@ -453,8 +451,7 @@ void __init ebus_init(void)
|
|||
return;
|
||||
}
|
||||
|
||||
cookie = pdev->sysdata;
|
||||
dp = cookie->prom_node;
|
||||
dp = pci_device_to_OF_node(pdev);
|
||||
|
||||
ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus));
|
||||
ebus->next = NULL;
|
||||
|
@ -480,8 +477,7 @@ void __init ebus_init(void)
|
|||
break;
|
||||
}
|
||||
ebus->is_rio = is_rio;
|
||||
cookie = pdev->sysdata;
|
||||
dp = cookie->prom_node;
|
||||
dp = pci_device_to_OF_node(pdev);
|
||||
continue;
|
||||
}
|
||||
printk("ebus%d:", num_ebus);
|
||||
|
@ -489,7 +485,6 @@ void __init ebus_init(void)
|
|||
ebus->index = num_ebus;
|
||||
ebus->prom_node = dp;
|
||||
ebus->self = pdev;
|
||||
ebus->parent = pbm = cookie->pbm;
|
||||
|
||||
ebus->ofdev.node = dp;
|
||||
ebus->ofdev.dev.parent = &pdev->dev;
|
||||
|
@ -531,8 +526,7 @@ void __init ebus_init(void)
|
|||
if (!pdev)
|
||||
break;
|
||||
|
||||
cookie = pdev->sysdata;
|
||||
dp = cookie->prom_node;
|
||||
dp = pci_device_to_OF_node(pdev);
|
||||
|
||||
ebus->next = ebus_alloc(sizeof(struct linux_ebus));
|
||||
ebus = ebus->next;
|
||||
|
|
|
@ -8,7 +8,6 @@
|
|||
#ifndef __SPARC64_EBUS_H
|
||||
#define __SPARC64_EBUS_H
|
||||
|
||||
#include <asm/pbm.h>
|
||||
#include <asm/oplib.h>
|
||||
#include <asm/prom.h>
|
||||
#include <asm/of_device.h>
|
||||
|
@ -41,7 +40,6 @@ struct linux_ebus {
|
|||
struct of_device ofdev;
|
||||
struct linux_ebus *next;
|
||||
struct linux_ebus_device *devices;
|
||||
struct pci_pbm_info *parent;
|
||||
struct pci_dev *self;
|
||||
int index;
|
||||
int is_rio;
|
||||
|
|
Loading…
Reference in New Issue