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

Commit 8184616f authored by Gavin Shan's avatar Gavin Shan Committed by Benjamin Herrenschmidt
Browse files

powerpc/powernv: Remove unnecessary assignment 



We don't have IO ports on PHB3 and the assignment of variable
"iomap_off" on PHB3 is meaningless. The patch just removes the
unnecessary assignment to the variable. The code change should
have been part of commit c35d2a8c ("powerpc/powernv: Needn't IO
segment map for PHB3").

Signed-off-by: default avatarGavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 97e7dc52

arch/powerpc/platforms/powernv/pci-ioda.c

+1 −2
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np, 
{

	struct pci_controller *hose;

	struct pnv_phb *phb;

	unsigned long size, m32map_off, iomap_off, pemap_off;

	unsigned long size, m32map_off, pemap_off, iomap_off = 0;

	const __be64 *prop64;

	const __be32 *prop32;

	int len;
@@ -1231,7 +1231,6 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np, 
	size = _ALIGN_UP(phb->ioda.total_pe / 8, sizeof(unsigned long));

	m32map_off = size;

	size += phb->ioda.total_pe * sizeof(phb->ioda.m32_segmap[0]);

	iomap_off = size;

	if (phb->type == PNV_PHB_IODA1) {

		iomap_off = size;

		size += phb->ioda.total_pe * sizeof(phb->ioda.io_segmap[0]);