From 25c83b84b110f50efe6fcf62e329f1db2af4454a Mon Sep 17 00:00:00 2001 From: Lukas Wunner Date: Thu, 19 Jul 2018 17:27:47 -0500 Subject: [PATCH] PCI: pciehp: Declare pciehp_enable/disable_slot() static No callers of pciehp_enable/disable_slot() outside of pciehp_ctrl.c remain, so declare the functions static. For now this requires forward declarations. Those can be eliminated by reshuffling functions once the ongoing effort to refactor the driver has settled. Signed-off-by: Lukas Wunner Signed-off-by: Bjorn Helgaas --- drivers/pci/hotplug/pciehp.h | 2 -- drivers/pci/hotplug/pciehp_ctrl.c | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h index 5417180..9c75acd 100644 --- a/drivers/pci/hotplug/pciehp.h +++ b/drivers/pci/hotplug/pciehp.h @@ -177,8 +177,6 @@ void pciehp_queue_pushbutton_work(struct work_struct *work); struct controller *pcie_init(struct pcie_device *dev); int pcie_init_notification(struct controller *ctrl); void pcie_shutdown_notification(struct controller *ctrl); -int pciehp_enable_slot(struct slot *p_slot); -int pciehp_disable_slot(struct slot *p_slot); void pcie_reenable_notification(struct controller *ctrl); int pciehp_power_on_slot(struct slot *slot); void pciehp_power_off_slot(struct slot *slot); diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 8ba9375..4a12e70 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c @@ -122,6 +122,9 @@ static void remove_board(struct slot *p_slot) pciehp_green_led_off(p_slot); } +static int pciehp_enable_slot(struct slot *slot); +static int pciehp_disable_slot(struct slot *slot); + void pciehp_request(struct controller *ctrl, int action) { atomic_or(action, &ctrl->pending_events); @@ -308,7 +311,7 @@ static int __pciehp_enable_slot(struct slot *p_slot) return board_added(p_slot); } -int pciehp_enable_slot(struct slot *slot) +static int pciehp_enable_slot(struct slot *slot) { struct controller *ctrl = slot->ctrl; int ret; @@ -342,7 +345,7 @@ static int __pciehp_disable_slot(struct slot *p_slot) return 0; } -int pciehp_disable_slot(struct slot *slot) +static int pciehp_disable_slot(struct slot *slot) { int ret; -- 2.7.4