Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e325e1f0 authored by Kristen Carlson Accardi's avatar Kristen Carlson Accardi Committed by Greg Kroah-Hartman
Browse files

PCI: fix multiple definition of `queue_pushbutton_work' 



Fix duplicate names in shpchp and pciehp.

Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 92333526

drivers/pci/hotplug/pciehp.h

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ extern u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl); 
extern u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl);

extern int pciehp_configure_device(struct slot *p_slot);

extern int pciehp_unconfigure_device(struct slot *p_slot);

extern void queue_pushbutton_work(struct work_struct *work);

extern void pciehp_queue_pushbutton_work(struct work_struct *work);

int pcie_init(struct controller *ctrl, struct pcie_device *dev);



static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)

drivers/pci/hotplug/pciehp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ static int init_slots(struct controller *ctrl) 
		slot->hpc_ops = ctrl->hpc_ops;

		slot->number = ctrl->first_slot;

		mutex_init(&slot->lock);

		INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);

		INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);



		/* register this slot with the hotplug pci core */

		hotplug_slot->private = slot;

drivers/pci/hotplug/pciehp_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ static void pciehp_power_thread(struct work_struct *work) 
	kfree(info);

}



void queue_pushbutton_work(struct work_struct *work)

void pciehp_queue_pushbutton_work(struct work_struct *work)

{

	struct slot *p_slot = container_of(work, struct slot, work.work);

	struct power_work_info *info;

drivers/pci/hotplug/shpchp.h

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl); 
extern int shpchp_configure_device(struct slot *p_slot);

extern int shpchp_unconfigure_device(struct slot *p_slot);

extern void cleanup_slots(struct controller *ctrl);

extern void queue_pushbutton_work(struct work_struct *work);

extern void shpchp_queue_pushbutton_work(struct work_struct *work);

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



#ifdef CONFIG_ACPI

drivers/pci/hotplug/shpchp_core.c

+1 −1
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ static int init_slots(struct controller *ctrl) 
		slot->hpc_ops = ctrl->hpc_ops;

		slot->number = ctrl->first_slot + (ctrl->slot_num_inc * i);

		mutex_init(&slot->lock);

		INIT_DELAYED_WORK(&slot->work, queue_pushbutton_work);

		INIT_DELAYED_WORK(&slot->work, shpchp_queue_pushbutton_work);



		/* register this slot with the hotplug pci core */

		hotplug_slot->private = slot;