diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-29 18:42:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 18:42:31 -0400 |
commit | e25ecd08c43e5111148dc4d847ac7e139ef76888 (patch) | |
tree | 06780c89b2eb5f4b76f42a7e56178b12771ae2d5 | |
parent | 957183f32e136450eb9a4b8eed52dfac46834eed (diff) |
riowd: Distinguish between driver name and OF device node name.
Driver messages should print the driver name, rather than the
OF device node name.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/watchdog/riowd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c index 98bb60ff02f2..04fd1bac2db5 100644 --- a/drivers/watchdog/riowd.c +++ b/drivers/watchdog/riowd.c | |||
@@ -48,8 +48,8 @@ MODULE_DESCRIPTION("Hardware watchdog driver for Sun RIO"); | |||
48 | MODULE_SUPPORTED_DEVICE("watchdog"); | 48 | MODULE_SUPPORTED_DEVICE("watchdog"); |
49 | MODULE_LICENSE("GPL"); | 49 | MODULE_LICENSE("GPL"); |
50 | 50 | ||
51 | #define RIOWD_NAME "pmc" | 51 | #define DRIVER_NAME "riowd" |
52 | #define PFX RIOWD_NAME ": " | 52 | #define PFX DRIVER_NAME ": " |
53 | 53 | ||
54 | struct riowd { | 54 | struct riowd { |
55 | void __iomem *regs; | 55 | void __iomem *regs; |
@@ -92,7 +92,7 @@ static int riowd_ioctl(struct inode *inode, struct file *filp, | |||
92 | static struct watchdog_info info = { | 92 | static struct watchdog_info info = { |
93 | .options = WDIOF_SETTIMEOUT, | 93 | .options = WDIOF_SETTIMEOUT, |
94 | .firmware_version = 1, | 94 | .firmware_version = 1, |
95 | .identity = "riowd", | 95 | .identity = DRIVER_NAME, |
96 | }; | 96 | }; |
97 | void __user *argp = (void __user *)arg; | 97 | void __user *argp = (void __user *)arg; |
98 | struct riowd *p = riowd_device; | 98 | struct riowd *p = riowd_device; |
@@ -190,7 +190,7 @@ static int __devinit riowd_probe(struct of_device *op, | |||
190 | 190 | ||
191 | spin_lock_init(&p->lock); | 191 | spin_lock_init(&p->lock); |
192 | 192 | ||
193 | p->regs = of_ioremap(&op->resource[0], 0, 2, "riowd"); | 193 | p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME); |
194 | if (!p->regs) { | 194 | if (!p->regs) { |
195 | printk(KERN_ERR PFX "Cannot map registers.\n"); | 195 | printk(KERN_ERR PFX "Cannot map registers.\n"); |
196 | goto out_free; | 196 | goto out_free; |
@@ -239,7 +239,7 @@ static struct of_device_id riowd_match[] = { | |||
239 | MODULE_DEVICE_TABLE(of, riowd_match); | 239 | MODULE_DEVICE_TABLE(of, riowd_match); |
240 | 240 | ||
241 | static struct of_platform_driver riowd_driver = { | 241 | static struct of_platform_driver riowd_driver = { |
242 | .name = "riowd", | 242 | .name = DRIVER_NAME, |
243 | .match_table = riowd_match, | 243 | .match_table = riowd_match, |
244 | .probe = riowd_probe, | 244 | .probe = riowd_probe, |
245 | .remove = __devexit_p(riowd_remove), | 245 | .remove = __devexit_p(riowd_remove), |