aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGavin Shan <gwshan@linux.vnet.ibm.com>2015-10-07 23:58:57 -0400
committerMichael Ellerman <mpe@ellerman.id.au>2015-10-21 05:42:15 -0400
commit608fb9c29660aca2845ba0730c514032c493a28f (patch)
treecc9ef4e6e202a8901baa7523230e822492583f5f
parent00ba05a12b3c9ee398235e03ad4bece7f836ada5 (diff)
powerpc/powernv: Cleanup on EEH comments
This applies cleanup on eeh-powernv.c, no functional changes: * Remove unnecessary comments and empty line. * Correct inaccurate comments. Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
-rw-r--r--arch/powerpc/platforms/powernv/eeh-powernv.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/arch/powerpc/platforms/powernv/eeh-powernv.c b/arch/powerpc/platforms/powernv/eeh-powernv.c
index 3bb6acb76339..2032936bdc62 100644
--- a/arch/powerpc/platforms/powernv/eeh-powernv.c
+++ b/arch/powerpc/platforms/powernv/eeh-powernv.c
@@ -43,17 +43,11 @@
43static bool pnv_eeh_nb_init = false; 43static bool pnv_eeh_nb_init = false;
44static int eeh_event_irq = -EINVAL; 44static int eeh_event_irq = -EINVAL;
45 45
46/**
47 * pnv_eeh_init - EEH platform dependent initialization
48 *
49 * EEH platform dependent initialization on powernv
50 */
51static int pnv_eeh_init(void) 46static int pnv_eeh_init(void)
52{ 47{
53 struct pci_controller *hose; 48 struct pci_controller *hose;
54 struct pnv_phb *phb; 49 struct pnv_phb *phb;
55 50
56 /* We require OPALv3 */
57 if (!firmware_has_feature(FW_FEATURE_OPALv3)) { 51 if (!firmware_has_feature(FW_FEATURE_OPALv3)) {
58 pr_warn("%s: OPALv3 is required !\n", 52 pr_warn("%s: OPALv3 is required !\n",
59 __func__); 53 __func__);
@@ -77,9 +71,9 @@ static int pnv_eeh_init(void)
77 /* 71 /*
78 * PE#0 should be regarded as valid by EEH core 72 * PE#0 should be regarded as valid by EEH core
79 * if it's not the reserved one. Currently, we 73 * if it's not the reserved one. Currently, we
80 * have the reserved PE#0 and PE#127 for PHB3 74 * have the reserved PE#255 and PE#127 for PHB3
81 * and P7IOC separately. So we should regard 75 * and P7IOC separately. So we should regard
82 * PE#0 as valid for P7IOC. 76 * PE#0 as valid for PHB3 and P7IOC.
83 */ 77 */
84 if (phb->ioda.reserved_pe != 0) 78 if (phb->ioda.reserved_pe != 0)
85 eeh_add_flag(EEH_VALID_PE_ZERO); 79 eeh_add_flag(EEH_VALID_PE_ZERO);
@@ -284,7 +278,6 @@ static int pnv_eeh_post_init(void)
284#endif /* CONFIG_DEBUG_FS */ 278#endif /* CONFIG_DEBUG_FS */
285 } 279 }
286 280
287
288 return ret; 281 return ret;
289} 282}
290 283
@@ -490,7 +483,6 @@ static int pnv_eeh_set_option(struct eeh_pe *pe, int option)
490 int opt, ret = 0; 483 int opt, ret = 0;
491 s64 rc; 484 s64 rc;
492 485
493 /* Sanity check on option */
494 switch (option) { 486 switch (option) {
495 case EEH_OPT_DISABLE: 487 case EEH_OPT_DISABLE:
496 return -EPERM; 488 return -EPERM;
@@ -1065,7 +1057,6 @@ static int pnv_eeh_err_inject(struct eeh_pe *pe, int type, int func,
1065 struct pnv_phb *phb = hose->private_data; 1057 struct pnv_phb *phb = hose->private_data;
1066 s64 rc; 1058 s64 rc;
1067 1059
1068 /* Sanity check on error type */
1069 if (type != OPAL_ERR_INJECT_TYPE_IOA_BUS_ERR && 1060 if (type != OPAL_ERR_INJECT_TYPE_IOA_BUS_ERR &&
1070 type != OPAL_ERR_INJECT_TYPE_IOA_BUS_ERR64) { 1061 type != OPAL_ERR_INJECT_TYPE_IOA_BUS_ERR64) {
1071 pr_warn("%s: Invalid error type %d\n", 1062 pr_warn("%s: Invalid error type %d\n",