Skip to content

Commit

Permalink
riowd: Distinguish between driver name and OF device node name.
Browse files Browse the repository at this point in the history
Driver messages should print the driver name, rather than the
OF device node name.

Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
davem330 committed Aug 29, 2008
1 parent 957183f commit e25ecd0
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/watchdog/riowd.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ MODULE_DESCRIPTION("Hardware watchdog driver for Sun RIO");
MODULE_SUPPORTED_DEVICE("watchdog");
MODULE_LICENSE("GPL");

#define RIOWD_NAME "pmc"
#define PFX RIOWD_NAME ": "
#define DRIVER_NAME "riowd"
#define PFX DRIVER_NAME ": "

struct riowd {
void __iomem *regs;
Expand Down Expand Up @@ -92,7 +92,7 @@ static int riowd_ioctl(struct inode *inode, struct file *filp,
static struct watchdog_info info = {
.options = WDIOF_SETTIMEOUT,
.firmware_version = 1,
.identity = "riowd",
.identity = DRIVER_NAME,
};
void __user *argp = (void __user *)arg;
struct riowd *p = riowd_device;
Expand Down Expand Up @@ -190,7 +190,7 @@ static int __devinit riowd_probe(struct of_device *op,

spin_lock_init(&p->lock);

p->regs = of_ioremap(&op->resource[0], 0, 2, "riowd");
p->regs = of_ioremap(&op->resource[0], 0, 2, DRIVER_NAME);
if (!p->regs) {
printk(KERN_ERR PFX "Cannot map registers.\n");
goto out_free;
Expand Down Expand Up @@ -239,7 +239,7 @@ static struct of_device_id riowd_match[] = {
MODULE_DEVICE_TABLE(of, riowd_match);

static struct of_platform_driver riowd_driver = {
.name = "riowd",
.name = DRIVER_NAME,
.match_table = riowd_match,
.probe = riowd_probe,
.remove = __devexit_p(riowd_remove),
Expand Down

0 comments on commit e25ecd0

Please sign in to comment.