powerpc/pci: clean up direct access to sysdata by iseries platform
PATCH v3 1/1 powerpc/pci: clean up direct access to sysdata by iseries platform
We shouldn't directly access sysdata to get the device node. We should be calling pci_device_to_OF_node().
Signed-off-by Kumar Gala <[email protected]>
---
* Fixed compile error (dev -> pdev)
arch/powerpc/platforms/iseries/iommu.c | 2 +- arch/powerpc/platforms/iseries/pci.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
arch/powerpc/platforms/iseries/iommu.c +1 -1
@@ -177,7 +177,7 @@ static struct iommu_table *iommu_table_find(struct iommu_table * tbl)static void pci_dma_dev_setup_iseries (struct pci_dev *pdev) {struct iommu_table *tbl; -struct device_node *dn = pdev->sysdata; +struct device_node *dn =pci_device_to_OF_node (pdev);struct pci_dn *pdn =PCI_DN (dn);const u32 *lsn =of_get_property (dn,"linux,logical-slot-number" ,NULL );
arch/powerpc/platforms/iseries/pci.c +4 -4
@@ -318,6 +318,7 @@ static void __init iomm_table_allocate_entry(struct pci_dev *dev, int bar_num) {struct resource *bar_res = &dev->resource[bar_num];long bar_size =pci_resource_len (dev, bar_num); +struct device_node *dn =pci_device_to_OF_node (dev);/* * No space to allocate, quick exit, skip Allocation.
@@ -335,9 +336,9 @@ static void __init iomm_table_allocate_entry(struct pci_dev *dev, int bar_num)* Allocate the number of table entries needed for BAR. */ while (bar_size >0 ) { - iomm_table[current_iomm_table_entry] = dev->sysdata; + iomm_table[current_iomm_table_entry] = dn; ds_addr_table[current_iomm_table_entry] = -iseries_ds_addr (dev->sysdata) | (bar_num <<24 ); +iseries_ds_addr (dn) | (bar_num <<24 ); bar_size -=IOMM_TABLE_ENTRY_SIZE ; ++current_iomm_table_entry; }
@@ -410,7 +411,7 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev)struct device_node *node;int i; - node =find_device_node (bus, pdev->devfn); + node =pci_device_to_OF_node (pdev);pr_debug ("PCI: iSeries %s, pdev %p, node %p\n" ,pci_name (pdev), pdev, node);if (!node) {
@@ -441,7 +442,6 @@ void __init iSeries_pcibios_fixup_resources(struct pci_dev *pdev) } } - pdev->sysdata = node;allocate_device_bars (pdev);iseries_device_information (pdev, bus, *sub_bus); }
Signature · 1 line
1.6.0.6
Hi Kumar,
Quoted 7 lines · On Mon, 18 May 2009 07:56:27 -0500 Kumar Gala <[email protected]> wrote:
We shouldn't directly access sysdata to get the device node. We should be calling
pci_device_to_OF_node().Signed-off-by Kumar Gala <[email protected]>---
* Fixed compile error (dev -> pdev)
I tested the previous version with the typo fixed, so assuming that you changed nothing else,
Tested-by Stephen Rothwell <[email protected]>
Acked-by Stephen Rothwell <[email protected]>
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/