diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-02-28 20:55:46 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-04-26 04:55:04 -0400 |
commit | 1327e9b62fc88e64ffbbd42d61fccd34e521bb86 (patch) | |
tree | 23d7c52e9cdc86b519b7d2289fd18855493d2d7d /arch | |
parent | 9b1caafe09ccec8e0103e9375b711e3a0c838260 (diff) |
[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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sparc64/kernel/ebus.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/sparc64/kernel/ebus.c b/arch/sparc64/kernel/ebus.c index 1962bfa4ef3d..0ace17bafba4 100644 --- a/arch/sparc64/kernel/ebus.c +++ b/arch/sparc64/kernel/ebus.c | |||
@@ -438,11 +438,9 @@ static struct pci_dev *find_next_ebus(struct pci_dev *start, int *is_rio_p) | |||
438 | 438 | ||
439 | void __init ebus_init(void) | 439 | void __init ebus_init(void) |
440 | { | 440 | { |
441 | struct pci_pbm_info *pbm; | ||
442 | struct linux_ebus_device *dev; | 441 | struct linux_ebus_device *dev; |
443 | struct linux_ebus *ebus; | 442 | struct linux_ebus *ebus; |
444 | struct pci_dev *pdev; | 443 | struct pci_dev *pdev; |
445 | struct pcidev_cookie *cookie; | ||
446 | struct device_node *dp; | 444 | struct device_node *dp; |
447 | int is_rio; | 445 | int is_rio; |
448 | int num_ebus = 0; | 446 | int num_ebus = 0; |
@@ -453,8 +451,7 @@ void __init ebus_init(void) | |||
453 | return; | 451 | return; |
454 | } | 452 | } |
455 | 453 | ||
456 | cookie = pdev->sysdata; | 454 | dp = pci_device_to_OF_node(pdev); |
457 | dp = cookie->prom_node; | ||
458 | 455 | ||
459 | ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus)); | 456 | ebus_chain = ebus = ebus_alloc(sizeof(struct linux_ebus)); |
460 | ebus->next = NULL; | 457 | ebus->next = NULL; |
@@ -480,8 +477,7 @@ void __init ebus_init(void) | |||
480 | break; | 477 | break; |
481 | } | 478 | } |
482 | ebus->is_rio = is_rio; | 479 | ebus->is_rio = is_rio; |
483 | cookie = pdev->sysdata; | 480 | dp = pci_device_to_OF_node(pdev); |
484 | dp = cookie->prom_node; | ||
485 | continue; | 481 | continue; |
486 | } | 482 | } |
487 | printk("ebus%d:", num_ebus); | 483 | printk("ebus%d:", num_ebus); |
@@ -489,7 +485,6 @@ void __init ebus_init(void) | |||
489 | ebus->index = num_ebus; | 485 | ebus->index = num_ebus; |
490 | ebus->prom_node = dp; | 486 | ebus->prom_node = dp; |
491 | ebus->self = pdev; | 487 | ebus->self = pdev; |
492 | ebus->parent = pbm = cookie->pbm; | ||
493 | 488 | ||
494 | ebus->ofdev.node = dp; | 489 | ebus->ofdev.node = dp; |
495 | ebus->ofdev.dev.parent = &pdev->dev; | 490 | ebus->ofdev.dev.parent = &pdev->dev; |
@@ -531,8 +526,7 @@ void __init ebus_init(void) | |||
531 | if (!pdev) | 526 | if (!pdev) |
532 | break; | 527 | break; |
533 | 528 | ||
534 | cookie = pdev->sysdata; | 529 | dp = pci_device_to_OF_node(pdev); |
535 | dp = cookie->prom_node; | ||
536 | 530 | ||
537 | ebus->next = ebus_alloc(sizeof(struct linux_ebus)); | 531 | ebus->next = ebus_alloc(sizeof(struct linux_ebus)); |
538 | ebus = ebus->next; | 532 | ebus = ebus->next; |