Skip to content

Commit

Permalink
[POWERPC] iseries: Constify & voidify get_property()
Browse files Browse the repository at this point in the history
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.

iseries platform changes.

Built for iseries_defconfig

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Jeremy Kerr authored and Paul Mackerras committed Jul 31, 2006
1 parent 954a46e commit c4c7cba
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/iseries/iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ void iommu_devnode_init_iSeries(struct device_node *dn)
{
struct iommu_table *tbl;
struct pci_dn *pdn = PCI_DN(dn);
u32 *lsn = (u32 *)get_property(dn, "linux,logical-slot-number", NULL);
const u32 *lsn = get_property(dn, "linux,logical-slot-number", NULL);

BUG_ON(lsn == NULL);

Expand Down
9 changes: 4 additions & 5 deletions arch/powerpc/platforms/iseries/pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -176,12 +176,12 @@ void iSeries_pcibios_init(void)
}
while ((node = of_get_next_child(root, node)) != NULL) {
HvBusNumber bus;
u32 *busp;
const u32 *busp;

if ((node->type == NULL) || (strcmp(node->type, "pci") != 0))
continue;

busp = (u32 *)get_property(node, "bus-range", NULL);
busp = get_property(node, "bus-range", NULL);
if (busp == NULL)
continue;
bus = *busp;
Expand Down Expand Up @@ -221,10 +221,9 @@ void __init iSeries_pci_final_fixup(void)

if (node != NULL) {
struct pci_dn *pdn = PCI_DN(node);
u32 *agent;
const u32 *agent;

agent = (u32 *)get_property(node, "linux,agent-id",
NULL);
agent = get_property(node, "linux,agent-id", NULL);
if ((pdn != NULL) && (agent != NULL)) {
u8 irq = iSeries_allocate_IRQ(pdn->busno, 0,
pdn->bussubno);
Expand Down

0 comments on commit c4c7cba

Please sign in to comment.