| Message ID | 20200918093050.37344-4-oohall@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5d69e46a2104050c0a458c6bf6abba5f58f56e4c |
| Headers | show |
| Series | [v2,1/9] powerpc/eeh: Rework EEH initialisation | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (27e2fbcd815a088d7d83c7158f76b6e95ab07c50) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 21 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
diff --git a/arch/powerpc/include/asm/eeh.h b/arch/powerpc/include/asm/eeh.h index 765bcf63edea..85030c05e67e 100644 --- a/arch/powerpc/include/asm/eeh.h +++ b/arch/powerpc/include/asm/eeh.h @@ -216,7 +216,6 @@ enum { struct eeh_ops { char *name; - int (*init)(void); struct eeh_dev *(*probe)(struct pci_dev *pdev); int (*set_option)(struct eeh_pe *pe, int option); int (*get_state)(struct eeh_pe *pe, int *delay); diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 28a0ea5d9faa..98faf139e676 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -965,14 +965,6 @@ int eeh_init(struct eeh_ops *ops) return ret; } - if (eeh_ops->init) - ret = eeh_ops->init(); - if (ret) { - pr_warn("%s: platform EEH init failed (%d)\n", - __func__, ret); - return ret; - } - /* Initialize PHB PEs */ list_for_each_entry_safe(hose, tmp, &hose_list, list_node) eeh_phb_pe_create(hose);
No longer used since the platforms perform their EEH initialisation before calling eeh_init(). Signed-off-by: Oliver O'Halloran <oohall@gmail.com> --- arch/powerpc/include/asm/eeh.h | 1 - arch/powerpc/kernel/eeh.c | 8 -------- 2 files changed, 9 deletions(-)