watchdog: hpwdt (4/12): Despecificate driver from iLO2

This driver supports both iLO2 and iLO3, but our user-visible strings
currently only reference iLO2. Let's just call it "iLO2+" to avoid having
to update strings for each iLO generation. This driver doesn't support
iLO ASICs prior to iLO2, but that is sufficiently explained in Kconfig.

Signed-off-by: dann frazier <dannf@hp.com>
Acked-by: Thomas Mingarelli <Thomas.Mingarelli@hp.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 4d2992aadfb7..cee25e401440 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -574,11 +574,11 @@ config IT87_WDT
           be called it87_wdt.
 
 config HP_WATCHDOG
-        tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
+        tristate "HP Proliant iLO2+ Hardware Watchdog Timer"
         depends on X86
         help
           A software monitoring watchdog and NMI sourcing driver. This driver
-          will detect lockups and provide stack trace. Also, when an NMI
+          will detect lockups and provide a stack trace. Also, when an NMI
           occurs this driver will make the necessary BIOS calls to log
           the cause of the NMI. This is a driver that will only load on a
           HP ProLiant system with a minimum of iLO2 support.
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index f0ecb14990df..e18f6b9f7947 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -48,8 +48,8 @@ static unsigned long __iomem *hpwdt_timer_reg;
 static unsigned long __iomem *hpwdt_timer_con;
 
 static struct pci_device_id hpwdt_devices[] = {
-        { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },
-        { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },
+        { PCI_DEVICE(PCI_VENDOR_ID_COMPAQ, 0xB203) },   /* iLO2 */
+        { PCI_DEVICE(PCI_VENDOR_ID_HP, 0x3306) },       /* iLO3 */
         {0},                    /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, hpwdt_devices);
@@ -548,7 +548,7 @@ static const struct watchdog_info ident = {
         .options = WDIOF_SETTIMEOUT |
                    WDIOF_KEEPALIVEPING |
                    WDIOF_MAGICCLOSE,
-        .identity = "HP iLO2 HW Watchdog Timer",
+        .identity = "HP iLO2+ HW Watchdog Timer",
 };
 
 static long hpwdt_ioctl(struct file *file, unsigned int cmd,
@@ -654,13 +654,13 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
         hpwdt_check_nmi_sourcing(dev);
 
         /*
-         * First let's find out if we are on an iLO2 server. We will
+         * First let's find out if we are on an iLO2+ server. We will
          * not run on a legacy ASM box.
          * So we only support the G5 ProLiant servers and higher.
          */
         if (dev->subsystem_vendor != PCI_VENDOR_ID_HP) {
                 dev_warn(&dev->dev,
-                        "This server does not have an iLO2 ASIC.\n");
+                        "This server does not have an iLO2+ ASIC.\n");
                 return -ENODEV;
         }
 
@@ -674,7 +674,7 @@ static int __devinit hpwdt_init_one(struct pci_dev *dev,
         pci_mem_addr = pci_iomap(dev, 1, 0x80);
         if (!pci_mem_addr) {
                 dev_warn(&dev->dev,
-                        "Unable to detect the iLO2 server memory.\n");
+                        "Unable to detect the iLO2+ server memory.\n");
                 retval = -ENOMEM;
                 goto error_pci_iomap;
         }