From: dann frazier <dannf@hp.com>
To: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-kernel@vger.kernel.org,
Thomas Mingarelli <thomas.mingarelli@hp.com>,
dann frazier <dannf@hp.com>
Subject: [PATCH 09/15] Despecificate driver from iLO2
Date: Tue, 27 Jul 2010 17:50:57 -0600 [thread overview]
Message-ID: <1280274663-9160-10-git-send-email-dannf@hp.com> (raw)
In-Reply-To: <1280274663-9160-1-git-send-email-dannf@hp.com>
This driver supports both iLO2 and iLO3, but our user-visible strings
currently only reference iLO2. Let's just call it "iLO" 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>
---
drivers/watchdog/Kconfig | 2 +-
drivers/watchdog/hpwdt.c | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index afcfacc..cde31f9 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -556,7 +556,7 @@ config IT87_WDT
be called it87_wdt.
config HP_WATCHDOG
- tristate "HP Proliant iLO 2 Hardware Watchdog Timer"
+ tristate "HP Proliant iLO Hardware Watchdog Timer"
depends on X86
help
A software monitoring watchdog and NMI sourcing driver. This driver
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
index cedcc61..a6b37fe 100644
--- a/drivers/watchdog/hpwdt.c
+++ b/drivers/watchdog/hpwdt.c
@@ -121,8 +121,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);
@@ -557,7 +557,7 @@ static const struct watchdog_info ident = {
.options = WDIOF_SETTIMEOUT |
WDIOF_KEEPALIVEPING |
WDIOF_MAGICCLOSE,
- .identity = "HP iLO2 HW Watchdog Timer",
+ .identity = "HP iLO HW Watchdog Timer",
};
static long hpwdt_ioctl(struct file *file, unsigned int cmd,
@@ -667,13 +667,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");
+ dev_warn(&dev->dev, "This server does not have an iLO ASIC"
+ " version 2 or greater.\n");
return -ENODEV;
}
@@ -687,7 +687,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 iLO server memory.\n");
retval = -ENOMEM;
goto error_pci_iomap;
}
--
1.7.1
next prev parent reply other threads:[~2010-07-27 23:53 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-27 23:50 [PATCH 00/15] hpwdt: make NMI code a config option (+ other cleanup) dann frazier
2010-07-27 23:50 ` [PATCH 01/15] hpwdt_pretimeout reorganization dann frazier
2010-07-27 23:50 ` [PATCH 02/15] remove unnecessary includes dann frazier
2010-07-27 23:50 ` [PATCH 03/15] include spinlock.h dann frazier
2010-07-27 23:50 ` [PATCH 04/15] add include for linux/bitops.h dann frazier
2010-07-27 23:50 ` [PATCH 05/15] Group together includes specific to NMI sourcing dann frazier
2010-07-27 23:50 ` [PATCH 06/15] Group options that affect watchdog behavior together dann frazier
2010-07-27 23:50 ` [PATCH 07/15] Group defines only used by NMI sourcing together dann frazier
2010-07-27 23:50 ` [PATCH 08/15] Group declarations specific to " dann frazier
2010-07-27 23:50 ` dann frazier [this message]
2010-08-04 20:13 ` [PATCH 09/15] Despecificate driver from iLO2 Wim Van Sebroeck
2010-08-04 20:18 ` Mingarelli, Thomas
2010-08-05 5:10 ` dann frazier
2010-07-27 23:50 ` [PATCH 10/15] Fix a typo dann frazier
2010-07-27 23:50 ` [PATCH 11/15] Make x86 assembly ifdef guard more strict dann frazier
2010-07-27 23:51 ` [PATCH 12/15] Construct status message w/ kasprintf and emit it with dev_info dann frazier
2010-07-28 18:38 ` dann frazier
2010-07-27 23:51 ` [PATCH 13/15] Use "decoding" instead of "sourcing" dann frazier
2010-07-27 23:51 ` [PATCH 14/15] Make NMI decoding a compile-time option dann frazier
2010-07-27 23:51 ` [PATCH 15/15] Bump version to 1.2.0 dann frazier
2010-07-28 13:10 ` [PATCH 00/15] hpwdt: make NMI code a config option (+ other cleanup) Mingarelli, Thomas
2010-08-05 21:41 ` Wim Van Sebroeck
2010-08-06 21:26 ` Wim Van Sebroeck
2010-08-06 21:29 ` dann frazier
2010-08-11 12:49 ` Wim Van Sebroeck
2010-08-13 7:29 ` dann frazier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1280274663-9160-10-git-send-email-dannf@hp.com \
--to=dannf@hp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=thomas.mingarelli@hp.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome