[PATCH] powerpc: Remove duplicate code
234-eeh-find-pe.patch The find_device_pe() routine is duplicated in two files. Remove one of the two copies, declare the other extern. Signed-off-by: Linas Vepstas <linas@austin.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org> (cherry picked from 48408e708282d4d0269136ff27ea5acbd9410b5a commit)
This commit is contained in:
parent
f751f84164
commit
9fb40eb883
|
@ -172,7 +172,7 @@ static inline unsigned long eeh_token_to_phys(unsigned long token)
|
|||
/**
|
||||
* Return the "partitionable endpoint" (pe) under which this device lies
|
||||
*/
|
||||
static struct device_node * find_device_pe(struct device_node *dn)
|
||||
struct device_node * find_device_pe(struct device_node *dn)
|
||||
{
|
||||
while ((dn->parent) && PCI_DN(dn->parent) &&
|
||||
(PCI_DN(dn->parent)->eeh_mode & EEH_MODE_SUPPORTED)) {
|
||||
|
|
|
@ -42,19 +42,6 @@ static inline const char * pcid_name (struct pci_dev *pdev)
|
|||
return "";
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the "partitionable endpoint" (pe) under which this device lies
|
||||
*/
|
||||
static struct device_node * find_device_pe(struct device_node *dn)
|
||||
{
|
||||
while ((dn->parent) && PCI_DN(dn->parent) &&
|
||||
(PCI_DN(dn->parent)->eeh_mode & EEH_MODE_SUPPORTED)) {
|
||||
dn = dn->parent;
|
||||
}
|
||||
return dn;
|
||||
}
|
||||
|
||||
|
||||
#ifdef DEBUG
|
||||
static void print_device_node_tree (struct pci_dn *pdn, int dent)
|
||||
{
|
||||
|
|
|
@ -109,6 +109,9 @@ int rtas_write_config(struct pci_dn *, int where, int size, u32 val);
|
|||
void eeh_mark_slot (struct device_node *dn, int mode_flag);
|
||||
void eeh_clear_slot (struct device_node *dn, int mode_flag);
|
||||
|
||||
/* Find the associated "Partiationable Endpoint" PE */
|
||||
struct device_node * find_device_pe(struct device_node *dn);
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
|
Loading…
Reference in a new issue