Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c4c7cba9 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Paul Mackerras
Browse files

[POWERPC] iseries: 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.

iseries platform changes.

Built for iseries_defconfig

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 954a46e2

arch/powerpc/platforms/iseries/iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/powerpc/platforms/iseries/pci.c

+4 −5
Original line number Diff line number Diff line
@@ -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;
@@ -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);