]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
PCI: pciehp: Cleanup whitespace
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 11 Feb 2014 22:26:29 +0000 (15:26 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 19 Feb 2014 22:05:25 +0000 (15:05 -0700)
Minor whitespace cleanup; no functional change.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
drivers/pci/hotplug/pciehp_acpi.c
drivers/pci/hotplug/pciehp_core.c
drivers/pci/hotplug/pciehp_ctrl.c

index eddddd447d0df61074d7a133524f37879ab73741..20fea57d2149c7ecf43e31c6ee16d820415ba85d 100644 (file)
@@ -112,6 +112,7 @@ static struct pcie_port_service_driver __initdata dummy_driver = {
 static int __init select_detection_mode(void)
 {
        struct dummy_slot *slot, *tmp;
+
        if (pcie_port_service_register(&dummy_driver))
                return PCIEHP_DETECT_ACPI;
        pcie_port_service_unregister(&dummy_driver);
index 23b4bde8aad376629f479e19963d6b5da7eae178..0e0a2fff20a39be57f7c9abc8bb422831c771416 100644 (file)
@@ -108,6 +108,7 @@ static int init_slot(struct controller *ctrl)
        ops = kzalloc(sizeof(*ops), GFP_KERNEL);
        if (!ops)
                goto out;
+
        ops->enable_slot = enable_slot;
        ops->disable_slot = disable_slot;
        ops->get_power_status = get_power_status;
index 0c2e524a1cf0cb49c079190bddfb0a302cb94ce2..c75e6a678dcc22f19707fc8d77200e1ee307afe6 100644 (file)
@@ -399,11 +399,10 @@ static void handle_button_press_event(struct slot *p_slot)
                 */
                ctrl_info(ctrl, "Button cancel on Slot(%s)\n", slot_name(p_slot));
                cancel_delayed_work(&p_slot->work);
-               if (p_slot->state == BLINKINGOFF_STATE) {
+               if (p_slot->state == BLINKINGOFF_STATE)
                        pciehp_green_led_on(p_slot);
-               } else {
+               else
                        pciehp_green_led_off(p_slot);
-               }
                pciehp_set_attention_status(p_slot, 0);
                ctrl_info(ctrl, "PCI slot #%s - action canceled "
                          "due to button press\n", slot_name(p_slot));
@@ -595,9 +594,9 @@ int pciehp_enable_slot(struct slot *p_slot)
        pciehp_get_latch_status(p_slot, &getstatus);
 
        rc = board_added(p_slot);
-       if (rc) {
+       if (rc)
                pciehp_get_latch_status(p_slot, &getstatus);
-       }
+
        return rc;
 }