Commit 1a765adf authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/hotplug' 

  - Remove unused pciehp EMI() and HP_SUPR_RM() macros (Ani Sinha)

  - Use of_node_name_eq() for node name comparisons (Rob Herring)

  - Convert shpchp_unconfigure_device() to void (Krzysztof Wilczynski)

* pci/hotplug:
  PCI: shpchp: Make shpchp_unconfigure_device() void
  PCI: Use of_node_name_eq() for node name comparisons
  PCI: pciehp: Remove unused EMI() and HP_SUPR_RM() macros
parents 8810a9c4 cfbd83d0

drivers/pci/hotplug/pciehp.h

+0 −2
Original line number Diff line number Diff line
@@ -148,8 +148,6 @@ struct controller { 
#define MRL_SENS(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_MRLSP)

#define ATTN_LED(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_AIP)

#define PWR_LED(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_PIP)

#define HP_SUPR_RM(ctrl)	((ctrl)->slot_cap & PCI_EXP_SLTCAP_HPS)

#define EMI(ctrl)		((ctrl)->slot_cap & PCI_EXP_SLTCAP_EIP)

#define NO_CMD_CMPL(ctrl)	((ctrl)->slot_cap & PCI_EXP_SLTCAP_NCCS)

#define PSN(ctrl)		(((ctrl)->slot_cap & PCI_EXP_SLTCAP_PSN) >> 19)

drivers/pci/hotplug/rpaphp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int rpaphp_drc_add_slot(struct device_node *dn) 
 */

int rpaphp_add_slot(struct device_node *dn)

{

	if (!dn->name || strcmp(dn->name, "pci"))

	if (!of_node_name_eq(dn, "pci"))

		return 0;



	if (of_find_property(dn, "ibm,drc-info", NULL))

drivers/pci/hotplug/shpchp.h

+1 −1
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl); 
u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl);

u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);

int shpchp_configure_device(struct slot *p_slot);

int shpchp_unconfigure_device(struct slot *p_slot);

void shpchp_unconfigure_device(struct slot *p_slot);

void cleanup_slots(struct controller *ctrl);

void shpchp_queue_pushbutton_work(struct work_struct *work);

int shpc_init(struct controller *ctrl, struct pci_dev *pdev);

drivers/pci/hotplug/shpchp_ctrl.c

+1 −2
Original line number Diff line number Diff line
@@ -341,8 +341,7 @@ static int remove_board(struct slot *p_slot) 
	u8 hp_slot;

	int rc;



	if (shpchp_unconfigure_device(p_slot))

		return(1);

	shpchp_unconfigure_device(p_slot);



	hp_slot = p_slot->device - ctrl->slot_device_offset;

	p_slot = shpchp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);

drivers/pci/hotplug/shpchp_pci.c

+1 −4
Original line number Diff line number Diff line
@@ -61,9 +61,8 @@ int shpchp_configure_device(struct slot *p_slot) 
	return ret;

}



int shpchp_unconfigure_device(struct slot *p_slot)

void shpchp_unconfigure_device(struct slot *p_slot)

{

	int rc = 0;

	struct pci_bus *parent = p_slot->ctrl->pci_dev->subordinate;

	struct pci_dev *dev, *temp;

	struct controller *ctrl = p_slot->ctrl;
@@ -83,6 +82,4 @@ int shpchp_unconfigure_device(struct slot *p_slot) 
	}



	pci_unlock_rescan_remove();

	return rc;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE