x86/pci: checkpatch.pl cleanup
PATCH v2 1/1 x86/pci: checkpatch.pl cleanup
This patch fixes warning and errors found by checkpatch.pl:
* replace asm/acpi.h, asm/io.h and asm/smp.h with linux/acpi.h, linux/io.h and linux/smp.h respectively
* remove explicit initialization to 0 of a static global variable
* replace printk(KERN_INFO ...) with pr_info
* use tabs instead of spaces for indentation
* arrange comments so that they adhere to Documentation/CodingStyle
---
Changes since v1:
* cleaned up all checkpatch.pl errors according to Ingo's review
arch/x86/pci/mrst.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-)
arch/x86/pci/mrst.c +21 -14
@@ -23,11 +23,11 @@#include <linux/ioport.h> #include <linux/init.h> #include <linux/dmi.h> +#include <linux/acpi.h> +#include <linux/io.h> +#include <linux/smp.h> -#include <asm/acpi.h> #include <asm/segment.h> -#include <asm/io.h> -#include <asm/smp.h> #include <asm/pci_x86.h> #include <asm/hw_irq.h> #include <asm/io_apic.h>
@@ -43,7 +43,7 @@#define PCI_FIXED_BAR_4_SIZE 0x14#define PCI_FIXED_BAR_5_SIZE 0x1c -static int pci_soc_mode =0 ; +static int pci_soc_mode;/** * fixed_bar_cap - return the offset of the fixed BAR cap if found
@@ -141,7 +141,8 @@ static int pci_device_update_fixed(struct pci_bus *bus, unsigned int devfn,*/ static bool type1_access_ok (unsigned int bus,unsigned int devfn,int reg) { -/* This is a workaround for A0 LNC bug where PCI status register does +/* +* This is a workaround for A0 LNC bug where PCI status register does * not have new CAP bit set. can not be written by SW either. * * PCI header type in real LNC indicates a single function device, this
@@ -172,7 +173,8 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where, {int offset; -/* On MRST, there is no PCI ROM BAR, this will cause a subsequent read +/* +* On MRST, there is no PCI ROM BAR, this will cause a subsequent read * to ROM BAR return 0 then being ignored. */ if (where ==PCI_ROM_ADDRESS )
@@ -210,7 +212,8 @@ static int mrst_pci_irq_enable(struct pci_dev *dev)pci_read_config_byte (dev,PCI_INTERRUPT_PIN , &pin); -/* MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to +/* +* MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to * IOAPIC RTE entries, so we just enable RTE for the device. */ irq_attr.ioapic =mp_find_ioapic (dev->irq);
@@ -235,7 +238,7 @@ struct pci_ops pci_mrst_ops = {*/ int __init pci_mrst_init (void ) { -printk (KERN_INFO "Intel MID platform detected, using MID PCI ops\n" ); +pr_info ("Intel MID platform detected, using MID PCI ops\n" );pci_mmcfg_late_init (); pcibios_enable_irq = mrst_pci_irq_enable; pci_root_ops = pci_mrst_ops;
@@ -244,16 +247,20 @@ int __init pci_mrst_init(void)return 1 ; } -/* Langwell devices are not true pci devices, they are not subject to 10 ms +/* +* Langwell devices are not true pci devices, they are not subject to 10 ms * d3 to d0 delay required by pci spec. */ static void pci_d3delay_fixup (struct pci_dev *dev) { -/* PCI fixups are effectively decided compile time. If we have a dual -SoC/non-SoC kernel we don't want to mangle d3 on non SoC devices */ -if (!pci_soc_mode) -return ; -/* true pci devices in lincroft should allow type 1 access, the rest +/* +* PCI fixups are effectively decided compile time. If we have a dual +* SoC/non-SoC kernel we don't want to mangle d3 on non SoC devices. +*/ +if (!pci_soc_mode) +return ; +/* +* True pci devices in lincroft should allow type 1 access, the rest * are langwell fake pci devices. */ if (type1_access_ok (dev->bus->number, dev->devfn,PCI_DEVICE_ID ))
Signature · 1 line
1.7.10.4
Quoted 10 lines · Valentina Manea
This patch fixes warning and errors found by checkpatch.pl:
* replace
asm/acpi.h,asm/io.handasm/smp.hwithlinux/acpi.h,linux/io.handlinux/smp.hrespectively
* remove explicit initialization to 0 of a static global variable
* replaceprintk(KERN_INFO ...)withpr_info
* use tabs instead of spaces for indentation
* arrange comments so that they adhere toDocumentation/CodingStyleSigned-off-by Valentina Manea <[email protected]>
Looks good, thanks.
Bjorn, I can pick this up into tip:x86/cleanups, or would you like to put this into the PCI tree?
Thanks,
Ingo
Bjorn Helgaas
maintainerQuoted 12 lines · Ingo Molnar
Quoted 9 lines · Valentina Manea
This patch fixes warning and errors found by checkpatch.pl:
* replace
asm/acpi.h,asm/io.handasm/smp.hwithlinux/acpi.h,linux/io.handlinux/smp.hrespectively
* remove explicit initialization to 0 of a static global variable
* replaceprintk(KERN_INFO ...)withpr_info
* use tabs instead of spaces for indentation
* arrange comments so that they adhere toDocumentation/CodingStyle
Quoted 6 lines
Quoted 1 line
Signed-off-by Valentina Manea <[email protected]>Looks good, thanks.
Bjorn, I can pick this up into tip:x86/cleanups, or would you like to put this into the PCI tree?
I added your ack, capitalized "PCI", "Langwell", etc. consistently, and put it in my pci/misc branch.
Bjorn