From: Andrew Morton - `register' is a compiler keyword - not a good choice of variable. - s/PCI_VENDOR_VIA/PCI_VENDOR_ID_VIA/ Exactly how well tested was this? Cc: Matthew Garrett Cc: Greg KH Cc: "Brown, Len" Cc: "Yu, Luming" Signed-off-by: Andrew Morton --- drivers/pci/quirks.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff -puN drivers/pci/quirks.c~clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume-fix drivers/pci/quirks.c --- a/drivers/pci/quirks.c~clear-abnormal-poweroff-flag-on-via-southbridges-fix-resume-fix +++ a/drivers/pci/quirks.c @@ -685,28 +685,28 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_V #ifdef CONFIG_ACPI_SLEEP -/* Some VIA systems boot with the abnormal status flag set. This can cause +/* + * Some VIA systems boot with the abnormal status flag set. This can cause * the BIOS to re-POST the system on resume rather than passing control - * back to the OS. Clear the flag on boot + * back to the OS. Clear the flag on boot */ - static void __devinit quirk_via_abnormal_poweroff(struct pci_dev *dev) { - u32 register; + u32 reg; - acpi_hw_register_read (ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS, - ®ister); + acpi_hw_register_read(ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS, + ®); - if (register & 0x800) { - printk ("Clearing abnormal poweroff flag\n"); - acpi_hw_register_write (ACPI_MTX_DO_NOT_LOCK, + if (reg & 0x800) { + printk("Clearing abnormal poweroff flag\n"); + acpi_hw_register_write(ACPI_MTX_DO_NOT_LOCK, ACPI_REGISTER_PM1_STATUS, (u16)0x800); } } -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_VIA, PCI_DEVICE_ID_VIA_8235, quirk_via_abnormal_poweroff); -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_VIA, PCI_DEVICE_ID_VIA_8237, quirk_via_abnormal_poweroff); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235, quirk_via_abnormal_poweroff); +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237, quirk_via_abnormal_poweroff); #endif _