[WATCHDOG] More coding-style and trivial clean-up

[sfrench/cifs-2.6.git] / drivers / watchdog / hpwdt.c

diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index a3765e0be4a82db9bedd1adb9175cc7cef6b08d3..6cf155d6b350f1549aedca4dff0e3e6684a733d1 100644 (file)
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -40,12 +40,14 @@
 #include <linux/bootmem.h>
 #include <linux/slab.h>
 #include <asm/desc.h>
+#include <asm/cacheflush.h>
 
 #define PCI_BIOS32_SD_VALUE            0x5F32335F      /* "_32_" */
 #define CRU_BIOS_SIGNATURE_VALUE       0x55524324
 #define PCI_BIOS32_PARAGRAPH_LEN       16
 #define PCI_ROM_BASE1                  0x000F0000
 #define ROM_SIZE                       0x10000
+#define HPWDT_VERSION                  "1.01"
 
 struct bios32_service_dir {
        u32 signature;
@@ -129,17 +131,14 @@ static void *cru_rom_addr;
 static struct cmn_registers cmn_regs;
 
 static struct pci_device_id hpwdt_devices[] = {
-       {
-        .vendor = PCI_VENDOR_ID_COMPAQ,
-        .device = 0xB203,
-        .subvendor = PCI_ANY_ID,
-        .subdevice = PCI_ANY_ID,
-       },
+       { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },
+       { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },
        {0},                    /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, hpwdt_devices);
 
-extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, unsigned long *pRomEntry);
+extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs,
+                                               unsigned long *pRomEntry);
 
 #ifndef CONFIG_X86_64
 /* --32 Bit Bios------------------------------------------------------------ */
@@ -394,6 +393,8 @@ static void __devinit dmi_find_cru(const struct dmi_header *dm)
                                smbios_cru64_ptr->double_offset;
                        cru_rom_addr = ioremap(cru_physical_address,
                                smbios_cru64_ptr->double_length);
+                       set_memory_x((unsigned long)cru_rom_addr & PAGE_MASK,
+                               smbios_cru64_ptr->double_length >> PAGE_SHIFT);
                }
        }
 }
@@ -482,7 +483,7 @@ static int hpwdt_pretimeout(struct notifier_block *nb, unsigned long ulReason,
                        "Management Log for details.\n");
        }
 
-       return NOTIFY_STOP;
+       return NOTIFY_OK;
 }
 
 /*
@@ -602,7 +603,7 @@ static long hpwdt_ioctl(struct file *file, unsigned int cmd,
 /*
  *     Kernel interfaces
  */
-static struct file_operations hpwdt_fops = {
+static const struct file_operations hpwdt_fops = {
        .owner = THIS_MODULE,
        .llseek = no_llseek,
        .write = hpwdt_write,
@@ -701,10 +702,11 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
        }
 
        printk(KERN_INFO
-               "hp Watchdog Timer Driver: 1.00"
+               "hp Watchdog Timer Driver: %s"
                ", timer margin: %d seconds (nowayout=%d)"
                ", allow kernel dump: %s (default = 0/OFF).\n",
-               soft_margin, nowayout, (allow_kdump == 0) ? "OFF" : "ON");
+               HPWDT_VERSION, soft_margin, nowayout,
+               (allow_kdump == 0) ? "OFF" : "ON");
 
        return 0;
 
@@ -754,6 +756,7 @@ static int __init hpwdt_init(void)
 MODULE_AUTHOR("Tom Mingarelli");
 MODULE_DESCRIPTION("hp watchdog driver");
 MODULE_LICENSE("GPL");
+MODULE_VERSION(HPWDT_VERSION);
 MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
 
 module_param(soft_margin, int, 0);