diff options
author | Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> | 2008-01-30 07:33:00 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:00 -0500 |
commit | 938f667198179dc0c8424e2cfac9cd9fe405bee3 (patch) | |
tree | 3ab65d500b927ad561e5d902f2be51916caab5d3 | |
parent | b3a5acc17c4ad9c28c00ee5e5271de1b1285d22b (diff) |
x86: coding style fixes in arch/x86/pci/fixup.c
Simple coding style fixes.
no code changed:
text data bss dec hex filename
3139 576 194 3909 f45 fixup.o.before
3139 576 194 3909 f45 fixup.o.after
md5:
9a3467057478b2d99962bdd448282eeb fixup.o.before.asm
9a3467057478b2d99962bdd448282eeb fixup.o.after.asm
Signed-off-by: Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/pci/fixup.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 6cff66dd0c91..cb63007e20b2 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c | |||
@@ -19,7 +19,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d) | |||
19 | 19 | ||
20 | printk(KERN_WARNING "PCI: Searching for i450NX host bridges on %s\n", pci_name(d)); | 20 | printk(KERN_WARNING "PCI: Searching for i450NX host bridges on %s\n", pci_name(d)); |
21 | reg = 0xd0; | 21 | reg = 0xd0; |
22 | for(pxb=0; pxb<2; pxb++) { | 22 | for(pxb = 0; pxb < 2; pxb++) { |
23 | pci_read_config_byte(d, reg++, &busno); | 23 | pci_read_config_byte(d, reg++, &busno); |
24 | pci_read_config_byte(d, reg++, &suba); | 24 | pci_read_config_byte(d, reg++, &suba); |
25 | pci_read_config_byte(d, reg++, &subb); | 25 | pci_read_config_byte(d, reg++, &subb); |
@@ -56,7 +56,7 @@ static void __devinit pci_fixup_umc_ide(struct pci_dev *d) | |||
56 | int i; | 56 | int i; |
57 | 57 | ||
58 | printk(KERN_WARNING "PCI: Fixing base address flags for device %s\n", pci_name(d)); | 58 | printk(KERN_WARNING "PCI: Fixing base address flags for device %s\n", pci_name(d)); |
59 | for(i=0; i<4; i++) | 59 | for(i = 0; i < 4; i++) |
60 | d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO; | 60 | d->resource[i].flags |= PCI_BASE_ADDRESS_SPACE_IO; |
61 | } | 61 | } |
62 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_UMC, PCI_DEVICE_ID_UMC_UM8886BF, pci_fixup_umc_ide); | 62 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_UMC, PCI_DEVICE_ID_UMC_UM8886BF, pci_fixup_umc_ide); |
@@ -127,7 +127,7 @@ static void pci_fixup_via_northbridge_bug(struct pci_dev *d) | |||
127 | NB latency to zero */ | 127 | NB latency to zero */ |
128 | pci_write_config_byte(d, PCI_LATENCY_TIMER, 0); | 128 | pci_write_config_byte(d, PCI_LATENCY_TIMER, 0); |
129 | 129 | ||
130 | where = 0x95; /* the memory write queue timer register is | 130 | where = 0x95; /* the memory write queue timer register is |
131 | different for the KT266x's: 0x95 not 0x55 */ | 131 | different for the KT266x's: 0x95 not 0x55 */ |
132 | } else if (d->device == PCI_DEVICE_ID_VIA_8363_0 && | 132 | } else if (d->device == PCI_DEVICE_ID_VIA_8363_0 && |
133 | (d->revision == VIA_8363_KL133_REVISION_ID || | 133 | (d->revision == VIA_8363_KL133_REVISION_ID || |
@@ -230,7 +230,7 @@ static int quirk_pcie_aspm_write(struct pci_bus *bus, unsigned int devfn, int wh | |||
230 | 230 | ||
231 | if ((offset) && (where == offset)) | 231 | if ((offset) && (where == offset)) |
232 | value = value & 0xfffffffc; | 232 | value = value & 0xfffffffc; |
233 | 233 | ||
234 | return raw_pci_ops->write(0, bus->number, devfn, where, size, value); | 234 | return raw_pci_ops->write(0, bus->number, devfn, where, size, value); |
235 | } | 235 | } |
236 | 236 | ||
@@ -271,8 +271,8 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev) | |||
271 | * after hot-remove, the pbus->devices is empty and this code | 271 | * after hot-remove, the pbus->devices is empty and this code |
272 | * will set the offsets to zero and the bus ops to parent's bus | 272 | * will set the offsets to zero and the bus ops to parent's bus |
273 | * ops, which is unmodified. | 273 | * ops, which is unmodified. |
274 | */ | 274 | */ |
275 | for (i= GET_INDEX(pdev->device, 0); i <= GET_INDEX(pdev->device, 7); ++i) | 275 | for (i = GET_INDEX(pdev->device, 0); i <= GET_INDEX(pdev->device, 7); ++i) |
276 | quirk_aspm_offset[i] = 0; | 276 | quirk_aspm_offset[i] = 0; |
277 | 277 | ||
278 | pbus->ops = pbus->parent->ops; | 278 | pbus->ops = pbus->parent->ops; |
@@ -286,17 +286,17 @@ static void pcie_rootport_aspm_quirk(struct pci_dev *pdev) | |||
286 | list_for_each_entry(dev, &pbus->devices, bus_list) { | 286 | list_for_each_entry(dev, &pbus->devices, bus_list) { |
287 | /* There are 0 to 8 devices attached to this bus */ | 287 | /* There are 0 to 8 devices attached to this bus */ |
288 | cap_base = pci_find_capability(dev, PCI_CAP_ID_EXP); | 288 | cap_base = pci_find_capability(dev, PCI_CAP_ID_EXP); |
289 | quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)]= cap_base + 0x10; | 289 | quirk_aspm_offset[GET_INDEX(pdev->device, dev->devfn)] = cap_base + 0x10; |
290 | } | 290 | } |
291 | pbus->ops = &quirk_pcie_aspm_ops; | 291 | pbus->ops = &quirk_pcie_aspm_ops; |
292 | } | 292 | } |
293 | } | 293 | } |
294 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PA, pcie_rootport_aspm_quirk ); | 294 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PA, pcie_rootport_aspm_quirk); |
295 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PA1, pcie_rootport_aspm_quirk ); | 295 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PA1, pcie_rootport_aspm_quirk); |
296 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PB, pcie_rootport_aspm_quirk ); | 296 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PB, pcie_rootport_aspm_quirk); |
297 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PB1, pcie_rootport_aspm_quirk ); | 297 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PB1, pcie_rootport_aspm_quirk); |
298 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC, pcie_rootport_aspm_quirk ); | 298 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC, pcie_rootport_aspm_quirk); |
299 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC1, pcie_rootport_aspm_quirk ); | 299 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MCH_PC1, pcie_rootport_aspm_quirk); |
300 | 300 | ||
301 | /* | 301 | /* |
302 | * Fixup to mark boot BIOS video selected by BIOS before it changes | 302 | * Fixup to mark boot BIOS video selected by BIOS before it changes |
@@ -336,8 +336,8 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev) | |||
336 | * PCI header type NORMAL. | 336 | * PCI header type NORMAL. |
337 | */ | 337 | */ |
338 | if (bridge | 338 | if (bridge |
339 | &&((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE) | 339 | && ((bridge->hdr_type == PCI_HEADER_TYPE_BRIDGE) |
340 | ||(bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) { | 340 | || (bridge->hdr_type == PCI_HEADER_TYPE_CARDBUS))) { |
341 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, | 341 | pci_read_config_word(bridge, PCI_BRIDGE_CONTROL, |
342 | &config); | 342 | &config); |
343 | if (!(config & PCI_BRIDGE_CTL_VGA)) | 343 | if (!(config & PCI_BRIDGE_CTL_VGA)) |