Skip to content

Commit

Permalink
powerpc/powernv: Remove unused file
Browse files Browse the repository at this point in the history
The patch removes unused file eeh-ioda.c and updates makefile
accordingly. Besides, the definition of "struct pnv_eeh_ops" and
the instances are all removed. Until now, the chip layer of EEH
implementation for PowerNV platform is removed completely.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
  • Loading branch information
Gavin Shan authored and Benjamin Herrenschmidt committed Mar 16, 2015
1 parent cadf364 commit 2f6cf79
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 55 deletions.
2 changes: 1 addition & 1 deletion arch/powerpc/platforms/powernv/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ obj-y += opal-msglog.o opal-hmi.o opal-power.o

obj-$(CONFIG_SMP) += smp.o subcore.o subcore-asm.o
obj-$(CONFIG_PCI) += pci.o pci-p5ioc2.o pci-ioda.o
obj-$(CONFIG_EEH) += eeh-ioda.o eeh-powernv.o
obj-$(CONFIG_EEH) += eeh-powernv.o
obj-$(CONFIG_PPC_SCOM) += opal-xscom.o
obj-$(CONFIG_MEMORY_FAILURE) += opal-memory-errors.o
obj-$(CONFIG_TRACEPOINTS) += opal-tracepoints.o
38 changes: 0 additions & 38 deletions arch/powerpc/platforms/powernv/eeh-ioda.c

This file was deleted.

3 changes: 0 additions & 3 deletions arch/powerpc/platforms/powernv/pci-ioda.c
Original file line number Diff line number Diff line change
Expand Up @@ -2078,9 +2078,6 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
phb->get_pe_state = pnv_ioda_get_pe_state;
phb->freeze_pe = pnv_ioda_freeze_pe;
phb->unfreeze_pe = pnv_ioda_unfreeze_pe;
#ifdef CONFIG_EEH
phb->eeh_ops = &ioda_eeh_ops;
#endif

/* Setup RID -> PE mapping function */
phb->bdfn_to_pe = pnv_ioda_bdfn_to_pe;
Expand Down
13 changes: 0 additions & 13 deletions arch/powerpc/platforms/powernv/pci.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,6 @@ struct pnv_ioda_pe {
struct list_head list;
};

/* IOC dependent EEH operations */
#ifdef CONFIG_EEH
struct pnv_eeh_ops {
};
#endif /* CONFIG_EEH */

#define PNV_PHB_FLAG_EEH (1 << 0)

struct pnv_phb {
Expand All @@ -94,10 +88,6 @@ struct pnv_phb {
int initialized;
spinlock_t lock;

#ifdef CONFIG_EEH
struct pnv_eeh_ops *eeh_ops;
#endif

#ifdef CONFIG_DEBUG_FS
int has_dbgfs;
struct dentry *dbgfs;
Expand Down Expand Up @@ -203,9 +193,6 @@ struct pnv_phb {
};

extern struct pci_ops pnv_pci_ops;
#ifdef CONFIG_EEH
extern struct pnv_eeh_ops ioda_eeh_ops;
#endif

void pnv_pci_dump_phb_diag_data(struct pci_controller *hose,
unsigned char *log_buff);
Expand Down

0 comments on commit 2f6cf79

Please sign in to comment.