Commit 10bf59d9 authored by Oliver O'Halloran's avatar Oliver O'Halloran Committed by Michael Ellerman
Browse files

powerpc/pseries/eeh: Fix dumb linebreaks 



These annoy me every time I see them. Why are they here? They're not even
needed for 80cols compliance.

Signed-off-by: default avatarOliver O'Halloran <oohall@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200818044557.135497-1-oohall@gmail.com
parent 353bce21

arch/powerpc/platforms/pseries/eeh_pseries.c

+4 −8
Original line number Original line Diff line number Diff line
@@ -161,8 +161,7 @@ static int pseries_eeh_phb_reset(struct pci_controller *phb, int config_addr, in 
			BUID_LO(phb->buid), option);

			BUID_LO(phb->buid), option);





	/* If fundamental-reset not supported, try hot-reset */

	/* If fundamental-reset not supported, try hot-reset */

	if (option == EEH_RESET_FUNDAMENTAL &&

	if (option == EEH_RESET_FUNDAMENTAL && ret == -8) {

	    ret == -8) {

		option = EEH_RESET_HOT;

		option = EEH_RESET_HOT;

		ret = rtas_call(ibm_set_slot_reset, 4, 1, NULL,

		ret = rtas_call(ibm_set_slot_reset, 4, 1, NULL,

				config_addr, BUID_HI(phb->buid),

				config_addr, BUID_HI(phb->buid),
@@ -170,8 +169,7 @@ static int pseries_eeh_phb_reset(struct pci_controller *phb, int config_addr, in 
	}

	}





	/* We need reset hold or settlement delay */

	/* We need reset hold or settlement delay */

	if (option == EEH_RESET_FUNDAMENTAL ||

	if (option == EEH_RESET_FUNDAMENTAL || option == EEH_RESET_HOT)

	    option == EEH_RESET_HOT)

		msleep(EEH_PE_RST_HOLD_TIME);

		msleep(EEH_PE_RST_HOLD_TIME);

	else

	else

		msleep(EEH_PE_RST_SETTLE_TIME);

		msleep(EEH_PE_RST_SETTLE_TIME);
@@ -621,8 +619,7 @@ static int pseries_eeh_set_option(struct eeh_pe *pe, int option) 
		/* Not support */

		/* Not support */

		return 0;

		return 0;

	default:

	default:

		pr_err("%s: Invalid option %d\n",

		pr_err("%s: Invalid option %d\n", __func__, option);

			__func__, option);

		return -EINVAL;

		return -EINVAL;

	}

	}
@@ -954,8 +951,7 @@ static int pseries_notify_resume(struct eeh_dev *edev) 
	if (!edev)

	if (!edev)

		return -EEXIST;

		return -EEXIST;





	if (rtas_token("ibm,open-sriov-allow-unfreeze")

	if (rtas_token("ibm,open-sriov-allow-unfreeze") == RTAS_UNKNOWN_SERVICE)

	    == RTAS_UNKNOWN_SERVICE)

		return -EINVAL;

		return -EINVAL;





	if (edev->pdev->is_physfn || edev->pdev->is_virtfn)

	if (edev->pdev->is_physfn || edev->pdev->is_virtfn)