of: eliminate of_device->node and dev_archdata->{of,prom}_node
This patch eliminates the node pointer from struct of_device and the of_node (or prom_node) pointer from struct dev_archdata since the node pointer is now part of struct device proper when CONFIG_OF is set, and all users of the old pointer locations have already been converted over to use device->of_node. Also remove dev_archdata_{get,set}_node() as it is no longer used by anything. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
@ -545,7 +545,6 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
|
||||
{
|
||||
struct iommu_window *window;
|
||||
struct cbe_iommu *iommu;
|
||||
struct dev_archdata *archdata = &dev->archdata;
|
||||
|
||||
/* Current implementation uses the first window available in that
|
||||
* node's iommu. We -might- do something smarter later though it may
|
||||
@ -554,7 +553,7 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)
|
||||
iommu = cell_iommu_for_node(dev_to_node(dev));
|
||||
if (iommu == NULL || list_empty(&iommu->windows)) {
|
||||
printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
|
||||
archdata->of_node ? archdata->of_node->full_name : "?",
|
||||
dev->of_node ? dev->of_node->full_name : "?",
|
||||
dev_to_node(dev));
|
||||
return NULL;
|
||||
}
|
||||
@ -897,7 +896,7 @@ static u64 cell_iommu_get_fixed_address(struct device *dev)
|
||||
const u32 *ranges = NULL;
|
||||
int i, len, best, naddr, nsize, pna, range_size;
|
||||
|
||||
np = of_node_get(dev->archdata.of_node);
|
||||
np = of_node_get(dev->of_node);
|
||||
while (1) {
|
||||
naddr = of_n_addr_cells(np);
|
||||
nsize = of_n_size_cells(np);
|
||||
|
Reference in New Issue
Block a user