aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/cpqphp_ctrl.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-11-14 13:28:18 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-11-14 13:28:18 -0500
commitf7625980f5820edd1a73536e1a03bcbc1f889fec (patch)
tree145e76f39b3e1d08d3e7a48a0993c0cd59088cc6 /drivers/pci/hotplug/cpqphp_ctrl.c
parent4fbf888accb39af423f271111d44e8186f053723 (diff)
PCI: Fix whitespace, capitalization, and spelling errors
Fix whitespace, capitalization, and spelling errors. No functional change. I know "busses" is not an error, but "buses" was more common, so I used it consistently. Signed-off-by: Marta Rybczynska <rybczynska@gmail.com> (pci_reset_bridge_secondary_bus()) Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_ctrl.c')
-rw-r--r--drivers/pci/hotplug/cpqphp_ctrl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/pci/hotplug/cpqphp_ctrl.c b/drivers/pci/hotplug/cpqphp_ctrl.c
index d282019cda5f..11845b796799 100644
--- a/drivers/pci/hotplug/cpqphp_ctrl.c
+++ b/drivers/pci/hotplug/cpqphp_ctrl.c
@@ -1231,7 +1231,7 @@ static u8 set_controller_speed(struct controller *ctrl, u8 adapter_speed, u8 hp_
1231 1231
1232 /* Only if mode change...*/ 1232 /* Only if mode change...*/
1233 if (((bus->cur_bus_speed == PCI_SPEED_66MHz) && (adapter_speed == PCI_SPEED_66MHz_PCIX)) || 1233 if (((bus->cur_bus_speed == PCI_SPEED_66MHz) && (adapter_speed == PCI_SPEED_66MHz_PCIX)) ||
1234 ((bus->cur_bus_speed == PCI_SPEED_66MHz_PCIX) && (adapter_speed == PCI_SPEED_66MHz))) 1234 ((bus->cur_bus_speed == PCI_SPEED_66MHz_PCIX) && (adapter_speed == PCI_SPEED_66MHz)))
1235 set_SOGO(ctrl); 1235 set_SOGO(ctrl);
1236 1236
1237 wait_for_ctrl_irq(ctrl); 1237 wait_for_ctrl_irq(ctrl);
@@ -1828,7 +1828,7 @@ static void interrupt_event_handler(struct controller *ctrl)
1828 1828
1829 if (ctrl->event_queue[loop].event_type == INT_BUTTON_PRESS) { 1829 if (ctrl->event_queue[loop].event_type == INT_BUTTON_PRESS) {
1830 dbg("button pressed\n"); 1830 dbg("button pressed\n");
1831 } else if (ctrl->event_queue[loop].event_type == 1831 } else if (ctrl->event_queue[loop].event_type ==
1832 INT_BUTTON_CANCEL) { 1832 INT_BUTTON_CANCEL) {
1833 dbg("button cancel\n"); 1833 dbg("button cancel\n");
1834 del_timer(&p_slot->task_event); 1834 del_timer(&p_slot->task_event);
@@ -2411,11 +2411,11 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
2411 if (rc) 2411 if (rc)
2412 return rc; 2412 return rc;
2413 2413
2414 /* find range of busses to use */ 2414 /* find range of buses to use */
2415 dbg("find ranges of buses to use\n"); 2415 dbg("find ranges of buses to use\n");
2416 bus_node = get_max_resource(&(resources->bus_head), 1); 2416 bus_node = get_max_resource(&(resources->bus_head), 1);
2417 2417
2418 /* If we don't have any busses to allocate, we can't continue */ 2418 /* If we don't have any buses to allocate, we can't continue */
2419 if (!bus_node) 2419 if (!bus_node)
2420 return -ENOMEM; 2420 return -ENOMEM;
2421 2421
@@ -2900,7 +2900,7 @@ static int configure_new_function(struct controller *ctrl, struct pci_func *func
2900 2900
2901 /* If this function needs an interrupt and we are behind 2901 /* If this function needs an interrupt and we are behind
2902 * a bridge and the pin is tied to something that's 2902 * a bridge and the pin is tied to something that's
2903 * alread mapped, set this one the same */ 2903 * already mapped, set this one the same */
2904 if (temp_byte && resources->irqs && 2904 if (temp_byte && resources->irqs &&
2905 (resources->irqs->valid_INT & 2905 (resources->irqs->valid_INT &
2906 (0x01 << ((temp_byte + resources->irqs->barber_pole - 1) & 0x03)))) { 2906 (0x01 << ((temp_byte + resources->irqs->barber_pole - 1) & 0x03)))) {