diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-11 17:26:29 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-02-19 17:05:25 -0500 |
commit | 9cad7f582055513fe13a93fee3ddb213656a6a5d (patch) | |
tree | bd9ca913968b64ac984c1dc4a462baa6fce9f82a /drivers/pci | |
parent | 2b3940b60626ac4932fa048cc74f2a872cc4bfb4 (diff) |
PCI: pciehp: Cleanup whitespace
Minor whitespace cleanup; no functional change.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/hotplug/pciehp_acpi.c | 1 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_core.c | 1 | ||||
-rw-r--r-- | drivers/pci/hotplug/pciehp_ctrl.c | 9 |
3 files changed, 6 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c index eddddd447d0d..20fea57d2149 100644 --- a/drivers/pci/hotplug/pciehp_acpi.c +++ b/drivers/pci/hotplug/pciehp_acpi.c | |||
@@ -112,6 +112,7 @@ static struct pcie_port_service_driver __initdata dummy_driver = { | |||
112 | static int __init select_detection_mode(void) | 112 | static int __init select_detection_mode(void) |
113 | { | 113 | { |
114 | struct dummy_slot *slot, *tmp; | 114 | struct dummy_slot *slot, *tmp; |
115 | |||
115 | if (pcie_port_service_register(&dummy_driver)) | 116 | if (pcie_port_service_register(&dummy_driver)) |
116 | return PCIEHP_DETECT_ACPI; | 117 | return PCIEHP_DETECT_ACPI; |
117 | pcie_port_service_unregister(&dummy_driver); | 118 | pcie_port_service_unregister(&dummy_driver); |
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 23b4bde8aad3..0e0a2fff20a3 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
@@ -108,6 +108,7 @@ static int init_slot(struct controller *ctrl) | |||
108 | ops = kzalloc(sizeof(*ops), GFP_KERNEL); | 108 | ops = kzalloc(sizeof(*ops), GFP_KERNEL); |
109 | if (!ops) | 109 | if (!ops) |
110 | goto out; | 110 | goto out; |
111 | |||
111 | ops->enable_slot = enable_slot; | 112 | ops->enable_slot = enable_slot; |
112 | ops->disable_slot = disable_slot; | 113 | ops->disable_slot = disable_slot; |
113 | ops->get_power_status = get_power_status; | 114 | ops->get_power_status = get_power_status; |
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 0c2e524a1cf0..c75e6a678dcc 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c | |||
@@ -399,11 +399,10 @@ static void handle_button_press_event(struct slot *p_slot) | |||
399 | */ | 399 | */ |
400 | ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot)); | 400 | ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot)); |
401 | cancel_delayed_work(&p_slot->work); | 401 | cancel_delayed_work(&p_slot->work); |
402 | if (p_slot->state == BLINKINGOFF_STATE) { | 402 | if (p_slot->state == BLINKINGOFF_STATE) |
403 | pciehp_green_led_on(p_slot); | 403 | pciehp_green_led_on(p_slot); |
404 | } else { | 404 | else |
405 | pciehp_green_led_off(p_slot); | 405 | pciehp_green_led_off(p_slot); |
406 | } | ||
407 | pciehp_set_attention_status(p_slot, 0); | 406 | pciehp_set_attention_status(p_slot, 0); |
408 | ctrl_info(ctrl, "PCI slot #%s - action canceled " | 407 | ctrl_info(ctrl, "PCI slot #%s - action canceled " |
409 | "due to button press\n", slot_name(p_slot)); | 408 | "due to button press\n", slot_name(p_slot)); |
@@ -595,9 +594,9 @@ int pciehp_enable_slot(struct slot *p_slot) | |||
595 | pciehp_get_latch_status(p_slot, &getstatus); | 594 | pciehp_get_latch_status(p_slot, &getstatus); |
596 | 595 | ||
597 | rc = board_added(p_slot); | 596 | rc = board_added(p_slot); |
598 | if (rc) { | 597 | if (rc) |
599 | pciehp_get_latch_status(p_slot, &getstatus); | 598 | pciehp_get_latch_status(p_slot, &getstatus); |
600 | } | 599 | |
601 | return rc; | 600 | return rc; |
602 | } | 601 | } |
603 | 602 | ||