diff options
author | Quentin Lambert <lambert.quentin@gmail.com> | 2014-09-07 14:02:47 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-24 09:49:20 -0400 |
commit | 656f978f9af9d8d77436e8159f51f7aa1e673309 (patch) | |
tree | d1cad3653ac41062a854eb0bc0f25fc03767f766 /drivers/pci/hotplug/cpqphp_ctrl.c | |
parent | 382a9c9adc1cd540f5b714b65db315fc1c0b553d (diff) |
PCI: Remove unnecessary curly braces
Remove curly braces in simple "if" cases.
No functional change.
Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_ctrl.c')
-rw-r--r-- | drivers/pci/hotplug/cpqphp_ctrl.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c index 476482e82fd2..c5cbefee5236 100644 --- a/drivers/pci/hotplug/cpqphp_ctrl.c +++ b/drivers/pci/hotplug/cpqphp_ctrl.c | |||
@@ -705,9 +705,8 @@ static struct pci_resource *get_max_resource(struct pci_resource **head, u32 siz | |||
705 | if (temp == max) { | 705 | if (temp == max) { |
706 | *head = max->next; | 706 | *head = max->next; |
707 | } else { | 707 | } else { |
708 | while (temp && temp->next != max) { | 708 | while (temp && temp->next != max) |
709 | temp = temp->next; | 709 | temp = temp->next; |
710 | } | ||
711 | 710 | ||
712 | if (temp) | 711 | if (temp) |
713 | temp->next = max->next; | 712 | temp->next = max->next; |
@@ -903,9 +902,8 @@ irqreturn_t cpqhp_ctrl_intr(int IRQ, void *data) | |||
903 | /* | 902 | /* |
904 | * Check to see if it was our interrupt | 903 | * Check to see if it was our interrupt |
905 | */ | 904 | */ |
906 | if (!(misc & 0x000C)) { | 905 | if (!(misc & 0x000C)) |
907 | return IRQ_NONE; | 906 | return IRQ_NONE; |
908 | } | ||
909 | 907 | ||
910 | if (misc & 0x0004) { | 908 | if (misc & 0x0004) { |
911 | /* | 909 | /* |
@@ -2006,9 +2004,8 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func) | |||
2006 | /* Check to see if the interlock is closed */ | 2004 | /* Check to see if the interlock is closed */ |
2007 | tempdword = readl(ctrl->hpc_reg + INT_INPUT_CLEAR); | 2005 | tempdword = readl(ctrl->hpc_reg + INT_INPUT_CLEAR); |
2008 | 2006 | ||
2009 | if (tempdword & (0x01 << hp_slot)) { | 2007 | if (tempdword & (0x01 << hp_slot)) |
2010 | return 1; | 2008 | return 1; |
2011 | } | ||
2012 | 2009 | ||
2013 | if (func->is_a_board) { | 2010 | if (func->is_a_board) { |
2014 | rc = board_replaced(func, ctrl); | 2011 | rc = board_replaced(func, ctrl); |
@@ -2070,9 +2067,8 @@ int cpqhp_process_SI(struct controller *ctrl, struct pci_func *func) | |||
2070 | } | 2067 | } |
2071 | } | 2068 | } |
2072 | 2069 | ||
2073 | if (rc) { | 2070 | if (rc) |
2074 | dbg("%s: rc = %d\n", __func__, rc); | 2071 | dbg("%s: rc = %d\n", __func__, rc); |
2075 | } | ||
2076 | 2072 | ||
2077 | if (p_slot) | 2073 | if (p_slot) |
2078 | update_slot_info(ctrl, p_slot); | 2074 | update_slot_info(ctrl, p_slot); |
@@ -2095,9 +2091,8 @@ int cpqhp_process_SS(struct controller *ctrl, struct pci_func *func) | |||
2095 | device = func->device; | 2091 | device = func->device; |
2096 | func = cpqhp_slot_find(ctrl->bus, device, index++); | 2092 | func = cpqhp_slot_find(ctrl->bus, device, index++); |
2097 | p_slot = cpqhp_find_slot(ctrl, device); | 2093 | p_slot = cpqhp_find_slot(ctrl, device); |
2098 | if (p_slot) { | 2094 | if (p_slot) |
2099 | physical_slot = p_slot->number; | 2095 | physical_slot = p_slot->number; |
2100 | } | ||
2101 | 2096 | ||
2102 | /* Make sure there are no video controllers here */ | 2097 | /* Make sure there are no video controllers here */ |
2103 | while (func && !rc) { | 2098 | while (func && !rc) { |