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

Commit 27d4396e authored by Sam Bobroff's avatar Sam Bobroff Committed by Michael Ellerman
Browse files

powerpc/eeh: Slightly simplify eeh_add_to_parent_pe() 



Simplify some needlessly complicated boolean logic in
eeh_add_to_parent_pe().

Signed-off-by: default avatarSam Bobroff <sbobroff@linux.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/09259a50308f10aa764695912bc87dc1d1cf654c.1565930772.git.sbobroff@linux.ibm.com
parent cef50c67

arch/powerpc/kernel/eeh_pe.c

+27 −25
Original line number Diff line number Diff line
@@ -383,16 +383,8 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
	 * components.

	 */

	pe = eeh_pe_get(pdn->phb, edev->pe_config_addr, config_addr);

	if (pe && !(pe->type & EEH_PE_INVALID)) {

		/* Mark the PE as type of PCI bus */

		pe->type = EEH_PE_BUS;

		edev->pe = pe;



		/* Put the edev to PE */

		list_add_tail(&edev->entry, &pe->edevs);

		eeh_edev_dbg(edev, "Added to bus PE\n");

		return 0;

	} else if (pe && (pe->type & EEH_PE_INVALID)) {

	if (pe) {

		if (pe->type & EEH_PE_INVALID) {

			list_add_tail(&edev->entry, &pe->edevs);

			edev->pe = pe;

			/*
@@ -407,8 +399,18 @@ int eeh_add_to_parent_pe(struct eeh_dev *edev) 
				parent = parent->parent;

			}



		eeh_edev_dbg(edev, "Added to device PE (parent: PE#%x)\n",

			eeh_edev_dbg(edev,

				     "Added to device PE (parent: PE#%x)\n",

				     pe->parent->addr);

		} else {

			/* Mark the PE as type of PCI bus */

			pe->type = EEH_PE_BUS;

			edev->pe = pe;



			/* Put the edev to PE */

			list_add_tail(&edev->entry, &pe->edevs);

			eeh_edev_dbg(edev, "Added to bus PE\n");

		}

		return 0;

	}