projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[linux-drm-fsl-dcu.git]
/
drivers
/
char
/
watchdog
/
mpcore_wdt.c
diff --git
a/drivers/char/watchdog/mpcore_wdt.c
b/drivers/char/watchdog/mpcore_wdt.c
index 9c11d920add543e585560c39490465b649b5e22d..3404a9c67f08c5b31e24ce3a2da324790ec6b1ef 100644
(file)
--- a/
drivers/char/watchdog/mpcore_wdt.c
+++ b/
drivers/char/watchdog/mpcore_wdt.c
@@
-64,7
+64,7
@@
MODULE_PARM_DESC(mpcore_noboot, "MPcore watchdog action, set to 1 to ignore rebo
* This is the interrupt handler. Note that we only use this
* in testing mode, so don't actually do a reboot here.
*/
* This is the interrupt handler. Note that we only use this
* in testing mode, so don't actually do a reboot here.
*/
-static irqreturn_t mpcore_wdt_fire(int irq, void *arg
, struct pt_regs *regs
)
+static irqreturn_t mpcore_wdt_fire(int irq, void *arg)
{
struct mpcore_wdt *wdt = arg;
{
struct mpcore_wdt *wdt = arg;
@@
-221,7
+221,7
@@
static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
} uarg;
if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
} uarg;
if (_IOC_DIR(cmd) && _IOC_SIZE(cmd) > sizeof(uarg))
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
if (_IOC_DIR(cmd) & _IOC_WRITE) {
ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd));
if (_IOC_DIR(cmd) & _IOC_WRITE) {
ret = copy_from_user(&uarg, (void __user *)arg, _IOC_SIZE(cmd));
@@
-271,7
+271,7
@@
static int mpcore_wdt_ioctl(struct inode *inode, struct file *file,
break;
default:
break;
default:
- return -ENO
IOCTLCMD
;
+ return -ENO
TTY
;
}
if (ret == 0 && _IOC_DIR(cmd) & _IOC_READ) {
}
if (ret == 0 && _IOC_DIR(cmd) & _IOC_READ) {
@@
-297,7
+297,7
@@
static void mpcore_wdt_shutdown(struct platform_device *dev)
/*
* Kernel Interfaces
*/
/*
* Kernel Interfaces
*/
-static struct file_operations mpcore_wdt_fops = {
+static
const
struct file_operations mpcore_wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = mpcore_wdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = mpcore_wdt_write,
@@
-355,7
+355,7
@@
static int __devinit mpcore_wdt_probe(struct platform_device *dev)
goto err_misc;
}
goto err_misc;
}
- ret = request_irq(wdt->irq, mpcore_wdt_fire,
SA_INTERRUPT
, "mpcore_wdt", wdt);
+ ret = request_irq(wdt->irq, mpcore_wdt_fire,
IRQF_DISABLED
, "mpcore_wdt", wdt);
if (ret) {
dev_printk(KERN_ERR, _dev, "cannot register IRQ%d for watchdog\n", wdt->irq);
goto err_irq;
if (ret) {
dev_printk(KERN_ERR, _dev, "cannot register IRQ%d for watchdog\n", wdt->irq);
goto err_irq;