diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2006-07-12 01:39:43 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 01:55:04 -0400 |
commit | 954a46e2d5aec6f59976ddeb1d232b486e59b54a (patch) | |
tree | 4e34abf431de3d6a31036c1fdf33fa4dadeb2951 /arch/powerpc/platforms/pseries/iommu.c | |
parent | a7f67bdf2c9f24509b8e81e0f35573b611987c80 (diff) |
[POWERPC] pseries: Constify & voidify get_property()
Now that get_property() returns a void *, there's no need to cast its
return value. Also, treat the return value as const, so we can
constify get_property later.
pseries platform changes.
Built for pseries_defconfig
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/platforms/pseries/iommu.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index d67af2c65754..bbf2e34dc358 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -267,13 +267,12 @@ static void iommu_table_setparms(struct pci_controller *phb, | |||
267 | struct iommu_table *tbl) | 267 | struct iommu_table *tbl) |
268 | { | 268 | { |
269 | struct device_node *node; | 269 | struct device_node *node; |
270 | unsigned long *basep; | 270 | const unsigned long *basep, *sizep; |
271 | unsigned int *sizep; | ||
272 | 271 | ||
273 | node = (struct device_node *)phb->arch_data; | 272 | node = (struct device_node *)phb->arch_data; |
274 | 273 | ||
275 | basep = (unsigned long *)get_property(node, "linux,tce-base", NULL); | 274 | basep = get_property(node, "linux,tce-base", NULL); |
276 | sizep = (unsigned int *)get_property(node, "linux,tce-size", NULL); | 275 | sizep = get_property(node, "linux,tce-size", NULL); |
277 | if (basep == NULL || sizep == NULL) { | 276 | if (basep == NULL || sizep == NULL) { |
278 | printk(KERN_ERR "PCI_DMA: iommu_table_setparms: %s has " | 277 | printk(KERN_ERR "PCI_DMA: iommu_table_setparms: %s has " |
279 | "missing tce entries !\n", dn->full_name); | 278 | "missing tce entries !\n", dn->full_name); |
@@ -315,7 +314,7 @@ static void iommu_table_setparms(struct pci_controller *phb, | |||
315 | static void iommu_table_setparms_lpar(struct pci_controller *phb, | 314 | static void iommu_table_setparms_lpar(struct pci_controller *phb, |
316 | struct device_node *dn, | 315 | struct device_node *dn, |
317 | struct iommu_table *tbl, | 316 | struct iommu_table *tbl, |
318 | unsigned char *dma_window) | 317 | const void *dma_window) |
319 | { | 318 | { |
320 | unsigned long offset, size; | 319 | unsigned long offset, size; |
321 | 320 | ||
@@ -415,7 +414,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus) | |||
415 | struct iommu_table *tbl; | 414 | struct iommu_table *tbl; |
416 | struct device_node *dn, *pdn; | 415 | struct device_node *dn, *pdn; |
417 | struct pci_dn *ppci; | 416 | struct pci_dn *ppci; |
418 | unsigned char *dma_window = NULL; | 417 | const void *dma_window = NULL; |
419 | 418 | ||
420 | DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self); | 419 | DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self); |
421 | 420 | ||
@@ -519,7 +518,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev) | |||
519 | { | 518 | { |
520 | struct device_node *pdn, *dn; | 519 | struct device_node *pdn, *dn; |
521 | struct iommu_table *tbl; | 520 | struct iommu_table *tbl; |
522 | unsigned char *dma_window = NULL; | 521 | const void *dma_window = NULL; |
523 | struct pci_dn *pci; | 522 | struct pci_dn *pci; |
524 | 523 | ||
525 | DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev)); | 524 | DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, pci_name(dev)); |