summaryrefslogtreecommitdiff
path: root/drivers/watchdog/mpc5200_wdt.c
diff options
context:
space:
mode:
authorWim Van Sebroeck <wim@iguana.be>2008-08-07 00:19:41 +0400
committerWim Van Sebroeck <wim@iguana.be>2008-08-07 00:19:41 +0400
commit7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9 (patch)
treefe6ec1a557a4b27712266d9d86f791c69e8e2596 /drivers/watchdog/mpc5200_wdt.c
parent12b7a1523eda9cd72362fdda928ddb995ecdc06d (diff)
downloadlinux-7944d3a5a70ee5c1904ed1e8b1d71ff0af2854d9.tar.xz
[WATCHDOG] more coding style clean-up's
More coding style clean-up's. Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog/mpc5200_wdt.c')
-rw-r--r--drivers/watchdog/mpc5200_wdt.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/watchdog/mpc5200_wdt.c b/drivers/watchdog/mpc5200_wdt.c
index ce1811d5d6b1..db91892558f2 100644
--- a/drivers/watchdog/mpc5200_wdt.c
+++ b/drivers/watchdog/mpc5200_wdt.c
@@ -164,7 +164,7 @@ static int mpc5200_wdt_release(struct inode *inode, struct file *file)
static const struct file_operations mpc5200_wdt_fops = {
.owner = THIS_MODULE,
.write = mpc5200_wdt_write,
- .ioctl = mpc5200_wdt_ioctl,
+ .unlocked_ioctl = mpc5200_wdt_ioctl,
.open = mpc5200_wdt_open,
.release = mpc5200_wdt_release,
};
@@ -219,9 +219,9 @@ static int mpc5200_wdt_probe(struct of_device *op,
return 0;
iounmap(wdt->regs);
- out_release:
+out_release:
release_mem_region(wdt->mem.start, size);
- out_free:
+out_free:
kfree(wdt);
return err;
}