diff options
author | Ryan Desfosses <ryan@desfo.org> | 2014-04-18 20:13:49 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-06-10 22:20:19 -0400 |
commit | 3c78bc61f5ef3bc87e7f94f67ec737d2273f120b (patch) | |
tree | 490efb8676389718e78a4d6775ad668538ecaf4f /drivers/pci/probe.c | |
parent | b7fe943421396b61b9f7a97c2554ed999e0f3658 (diff) |
PCI: Whitespace cleanup
Fix various whitespace errors.
No functional change.
[bhelgaas: fix other similar problems]
Signed-off-by: Ryan Desfosses <ryan@desfo.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 96b954f55d0d..468a6505bef1 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -168,7 +168,7 @@ static inline unsigned long decode_bar(struct pci_dev *dev, u32 bar) | |||
168 | * Returns 1 if the BAR is 64-bit, or 0 if 32-bit. | 168 | * Returns 1 if the BAR is 64-bit, or 0 if 32-bit. |
169 | */ | 169 | */ |
170 | int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, | 170 | int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, |
171 | struct resource *res, unsigned int pos) | 171 | struct resource *res, unsigned int pos) |
172 | { | 172 | { |
173 | u32 l, sz, mask; | 173 | u32 l, sz, mask; |
174 | u64 l64, sz64, mask64; | 174 | u64 l64, sz64, mask64; |
@@ -604,7 +604,6 @@ static enum pci_bus_speed agp_speed(int agp3, int agpstat) | |||
604 | return agp_speeds[index]; | 604 | return agp_speeds[index]; |
605 | } | 605 | } |
606 | 606 | ||
607 | |||
608 | static void pci_set_bus_speed(struct pci_bus *bus) | 607 | static void pci_set_bus_speed(struct pci_bus *bus) |
609 | { | 608 | { |
610 | struct pci_dev *bridge = bus->self; | 609 | struct pci_dev *bridge = bus->self; |
@@ -636,11 +635,10 @@ static void pci_set_bus_speed(struct pci_bus *bus) | |||
636 | } else if (status & PCI_X_SSTATUS_266MHZ) { | 635 | } else if (status & PCI_X_SSTATUS_266MHZ) { |
637 | max = PCI_SPEED_133MHz_PCIX_266; | 636 | max = PCI_SPEED_133MHz_PCIX_266; |
638 | } else if (status & PCI_X_SSTATUS_133MHZ) { | 637 | } else if (status & PCI_X_SSTATUS_133MHZ) { |
639 | if ((status & PCI_X_SSTATUS_VERS) == PCI_X_SSTATUS_V2) { | 638 | if ((status & PCI_X_SSTATUS_VERS) == PCI_X_SSTATUS_V2) |
640 | max = PCI_SPEED_133MHz_PCIX_ECC; | 639 | max = PCI_SPEED_133MHz_PCIX_ECC; |
641 | } else { | 640 | else |
642 | max = PCI_SPEED_133MHz_PCIX; | 641 | max = PCI_SPEED_133MHz_PCIX; |
643 | } | ||
644 | } else { | 642 | } else { |
645 | max = PCI_SPEED_66MHz_PCIX; | 643 | max = PCI_SPEED_66MHz_PCIX; |
646 | } | 644 | } |
@@ -664,7 +662,6 @@ static void pci_set_bus_speed(struct pci_bus *bus) | |||
664 | } | 662 | } |
665 | } | 663 | } |
666 | 664 | ||
667 | |||
668 | static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, | 665 | static struct pci_bus *pci_alloc_child_bus(struct pci_bus *parent, |
669 | struct pci_dev *bridge, int busnr) | 666 | struct pci_dev *bridge, int busnr) |
670 | { | 667 | { |
@@ -729,7 +726,8 @@ add_dev: | |||
729 | return child; | 726 | return child; |
730 | } | 727 | } |
731 | 728 | ||
732 | struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, int busnr) | 729 | struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev, |
730 | int busnr) | ||
733 | { | 731 | { |
734 | struct pci_bus *child; | 732 | struct pci_bus *child; |
735 | 733 | ||
@@ -888,7 +886,7 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass) | |||
888 | * as cards with a PCI-to-PCI bridge can be | 886 | * as cards with a PCI-to-PCI bridge can be |
889 | * inserted later. | 887 | * inserted later. |
890 | */ | 888 | */ |
891 | for (i=0; i<CARDBUS_RESERVE_BUSNR; i++) { | 889 | for (i = 0; i < CARDBUS_RESERVE_BUSNR; i++) { |
892 | struct pci_bus *parent = bus; | 890 | struct pci_bus *parent = bus; |
893 | if (pci_find_bus(pci_domain_nr(bus), | 891 | if (pci_find_bus(pci_domain_nr(bus), |
894 | max+i+1)) | 892 | max+i+1)) |
@@ -994,7 +992,6 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev) | |||
994 | pdev->is_hotplug_bridge = 1; | 992 | pdev->is_hotplug_bridge = 1; |
995 | } | 993 | } |
996 | 994 | ||
997 | |||
998 | /** | 995 | /** |
999 | * pci_ext_cfg_is_aliased - is ext config space just an alias of std config? | 996 | * pci_ext_cfg_is_aliased - is ext config space just an alias of std config? |
1000 | * @dev: PCI device | 997 | * @dev: PCI device |
@@ -1285,7 +1282,7 @@ struct pci_dev *pci_alloc_dev(struct pci_bus *bus) | |||
1285 | EXPORT_SYMBOL(pci_alloc_dev); | 1282 | EXPORT_SYMBOL(pci_alloc_dev); |
1286 | 1283 | ||
1287 | bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l, | 1284 | bool pci_bus_read_dev_vendor_id(struct pci_bus *bus, int devfn, u32 *l, |
1288 | int crs_timeout) | 1285 | int crs_timeout) |
1289 | { | 1286 | { |
1290 | int delay = 1; | 1287 | int delay = 1; |
1291 | 1288 | ||
@@ -1719,7 +1716,7 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus) | |||
1719 | bus->is_added = 1; | 1716 | bus->is_added = 1; |
1720 | } | 1717 | } |
1721 | 1718 | ||
1722 | for (pass=0; pass < 2; pass++) | 1719 | for (pass = 0; pass < 2; pass++) |
1723 | list_for_each_entry(dev, &bus->devices, bus_list) { | 1720 | list_for_each_entry(dev, &bus->devices, bus_list) { |
1724 | if (pci_is_bridge(dev)) | 1721 | if (pci_is_bridge(dev)) |
1725 | max = pci_scan_bridge(bus, dev, max, pass); | 1722 | max = pci_scan_bridge(bus, dev, max, pass); |
@@ -2062,7 +2059,8 @@ void pci_unlock_rescan_remove(void) | |||
2062 | } | 2059 | } |
2063 | EXPORT_SYMBOL_GPL(pci_unlock_rescan_remove); | 2060 | EXPORT_SYMBOL_GPL(pci_unlock_rescan_remove); |
2064 | 2061 | ||
2065 | static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b) | 2062 | static int __init pci_sort_bf_cmp(const struct device *d_a, |
2063 | const struct device *d_b) | ||
2066 | { | 2064 | { |
2067 | const struct pci_dev *a = to_pci_dev(d_a); | 2065 | const struct pci_dev *a = to_pci_dev(d_a); |
2068 | const struct pci_dev *b = to_pci_dev(d_b); | 2066 | const struct pci_dev *b = to_pci_dev(d_b); |