watchdog: iTCO_wdt: Cleanup warning messages

The current iTCO_wdt driver warnings are confusing.  Currently when the device
driver returns an error the console contains:

iTCO_vendor_support: vendor-support=0
iTCO_wdt: Intel TCO WatchDog Timer Driver v1.05
iTCO_wdt: failed to reset NO_REBOOT flag, reboot disabled by hardware
iTCO_wdt: No card detected

After the patch,

iTCO_vendor_support: vendor-support=0
iTCO_wdt: Intel TCO WatchDog Timer Driver v1.05
iTCO_wdt: failed to reset NO_REBOOT flag, device disabled by hardware/BIOS

Clean this up and use the word "device" to describe the device.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

diff --git a/drivers/watchdog/iTCO_wdt.c b/drivers/watchdog/iTCO_wdt.c
index cdc79450538de2c35592d47d32d2de0cc24f2631..bc69731a5e6a993b9e3043d26025c8bf26fa1b76 100644 (file)
--- a/drivers/watchdog/iTCO_wdt.c
+++ b/drivers/watchdog/iTCO_wdt.c
@@ -377,7 +377,7 @@ static char expect_release;
 static struct {                /* this is private data for the iTCO_wdt device */
        /* TCO version/generation */
        unsigned int iTCO_version;
-       /* The cards ACPIBASE address (TCOBASE = ACPIBASE+0x60) */
+       /* The device's ACPIBASE address (TCOBASE = ACPIBASE+0x60) */
        unsigned long ACPIBASE;
        /* NO_REBOOT flag is Memory-Mapped GCS register bit 5 (TCO version 2)*/
        unsigned long __iomem *gcs;
@@ -470,7 +470,7 @@ static int iTCO_wdt_start(void)
        if (iTCO_wdt_unset_NO_REBOOT_bit()) {
                spin_unlock(&iTCO_wdt_private.io_lock);
                printk(KERN_ERR PFX "failed to reset NO_REBOOT flag, "
-                                       "reboot disabled by hardware\n");
+                                       "reboot disabled by hardware/BIOS\n");
                return -EIO;
        }
 
@@ -784,7 +784,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
        base_address &= 0x0000ff80;
        if (base_address == 0x00000000) {
                /* Something's wrong here, ACPIBASE has to be set */
-               printk(KERN_ERR PFX "failed to get TCOBASE address\n");
+               printk(KERN_ERR PFX "failed to get TCOBASE address, "
+                                       "device disabled by hardware/BIOS\n");
                pci_dev_put(pdev);
                return -ENODEV;
        }
@@ -800,7 +801,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
        if (iTCO_wdt_private.iTCO_version == 2) {
                pci_read_config_dword(pdev, 0xf0, &base_address);
                if ((base_address & 1) == 0) {
-                       printk(KERN_ERR PFX "RCBA is disabled by hardware\n");
+                       printk(KERN_ERR PFX "RCBA is disabled by hardware"
+                                               "/BIOS, device disabled\n");
                        ret = -ENODEV;
                        goto out;
                }
@@ -811,7 +813,7 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
        /* Check chipset's NO_REBOOT bit */
        if (iTCO_wdt_unset_NO_REBOOT_bit() && iTCO_vendor_check_noreboot_on()) {
                printk(KERN_INFO PFX "unable to reset NO_REBOOT flag, "
-                                       "platform may have disabled it\n");
+                                       "device disabled by hardware/BIOS\n");
                ret = -ENODEV;  /* Cannot reset NO_REBOOT bit */
                goto out_unmap;
        }
@@ -822,7 +824,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
        /* The TCO logic uses the TCO_EN bit in the SMI_EN register */
        if (!request_region(SMI_EN, 4, "iTCO_wdt")) {
                printk(KERN_ERR PFX
-                       "I/O address 0x%04lx already in use\n", SMI_EN);
+                       "I/O address 0x%04lx already in use, "
+                                               "device disabled\n", SMI_EN);
                ret = -EIO;
                goto out_unmap;
        }
@@ -834,8 +837,8 @@ static int __devinit iTCO_wdt_init(struct pci_dev *pdev,
        /* The TCO I/O registers reside in a 32-byte range pointed to
           by the TCOBASE value */
        if (!request_region(TCOBASE, 0x20, "iTCO_wdt")) {
-               printk(KERN_ERR PFX "I/O address 0x%04lx already in use\n",
-                       TCOBASE);
+               printk(KERN_ERR PFX "I/O address 0x%04lx already in use "
+                                               "device disabled\n", TCOBASE);
                ret = -EIO;
                goto unreg_smi_en;
        }
@@ -924,7 +927,7 @@ static int __devinit iTCO_wdt_probe(struct platform_device *dev)
        }
 
        if (!found)
-               printk(KERN_INFO PFX "No card detected\n");
+               printk(KERN_INFO PFX "No device detected.\n");
 
        return ret;
 }