Emulation/switch-linux
1
0
Fork 0
mirror of https://github.com/fail0verflow/switch-linux.git synced 2025-05-04 02:34:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

Browse source
This commit is contained in:
Wim Van Sebroeck 2006-12-12 23:48:41 +01:00
commit a57bf8a4f2
4 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/char/watchdog/at91rm9200_wdt.c
View file

@ -203,9 +203,9 @@ static int __init at91wdt_probe(struct platform_device *pdev)
{ {
int res; int res;
if (at91wdt_miscdev.dev) if (at91wdt_miscdev.parent)
return -EBUSY; return -EBUSY;
at91wdt_miscdev.dev = &pdev->dev; at91wdt_miscdev.parent = &pdev->dev;
res = misc_register(&at91wdt_miscdev); res = misc_register(&at91wdt_miscdev);
if (res) if (res)
@ -221,7 +221,7 @@ static int __exit at91wdt_remove(struct platform_device *pdev)
res = misc_deregister(&at91wdt_miscdev); res = misc_deregister(&at91wdt_miscdev);
if (!res) if (!res)
at91wdt_miscdev.dev = NULL; at91wdt_miscdev.parent = NULL;
return res; return res;
} }

2
drivers/char/watchdog/mpcore_wdt.c
View file

@ -347,7 +347,7 @@ static int __devinit mpcore_wdt_probe(struct platform_device *dev)
goto err_free; goto err_free;
} }
mpcore_wdt_miscdev.dev = &dev->dev; mpcore_wdt_miscdev.parent = &dev->dev;
ret = misc_register(&mpcore_wdt_miscdev); ret = misc_register(&mpcore_wdt_miscdev);
if (ret) { if (ret) {
dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n", dev_printk(KERN_ERR, _dev, "cannot register miscdev on minor=%d (err=%d)\n",

2
drivers/char/watchdog/omap_wdt.c
View file

@ -290,7 +290,7 @@ static int __init omap_wdt_probe(struct platform_device *pdev)
omap_wdt_disable(); omap_wdt_disable();
omap_wdt_adjust_timeout(timer_margin); omap_wdt_adjust_timeout(timer_margin);
omap_wdt_miscdev.dev = &pdev->dev; omap_wdt_miscdev.parent = &pdev->dev;
ret = misc_register(&omap_wdt_miscdev); ret = misc_register(&omap_wdt_miscdev);
if (ret) if (ret)
goto fail; goto fail;

44
drivers/char/watchdog/rm9k_wdt.c
View file

@ -47,7 +47,7 @@
/* Function prototypes */ /* Function prototypes */
static irqreturn_t wdt_gpi_irqhdl(int, void *, struct pt_regs *); static irqreturn_t wdt_gpi_irqhdl(int, void *);
static void wdt_gpi_start(void); static void wdt_gpi_start(void);
static void wdt_gpi_stop(void); static void wdt_gpi_stop(void);
static void wdt_gpi_set_timeout(unsigned int); static void wdt_gpi_set_timeout(unsigned int);
@ -94,8 +94,28 @@ module_param(nowayout, bool, 0444);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started"); MODULE_PARM_DESC(nowayout, "Watchdog cannot be disabled once started");
/* Kernel interfaces */
static struct file_operations fops = {
.owner = THIS_MODULE,
.open = wdt_gpi_open,
.release = wdt_gpi_release,
.write = wdt_gpi_write,
.unlocked_ioctl = wdt_gpi_ioctl,
};
static struct miscdevice miscdev = {
.minor = WATCHDOG_MINOR,
.name = wdt_gpi_name,
.fops = &fops,
};
static struct notifier_block wdt_gpi_shutdown = {
.notifier_call = wdt_gpi_notify,
};
/* Interrupt handler */ /* Interrupt handler */
static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt, struct pt_regs *regs) static irqreturn_t wdt_gpi_irqhdl(int irq, void *ctxt)
{ {
if (!unlikely(__raw_readl(wd_regs + 0x0008) & 0x1)) if (!unlikely(__raw_readl(wd_regs + 0x0008) & 0x1))
return IRQ_NONE; return IRQ_NONE;
@ -312,26 +332,6 @@ wdt_gpi_notify(struct notifier_block *this, unsigned long code, void *unused)
} }
/* Kernel interfaces */
static struct file_operations fops = {
.owner = THIS_MODULE,
.open = wdt_gpi_open,
.release = wdt_gpi_release,
.write = wdt_gpi_write,
.unlocked_ioctl = wdt_gpi_ioctl,
};
static struct miscdevice miscdev = {
.minor = WATCHDOG_MINOR,
.name = wdt_gpi_name,
.fops = &fops,
};
static struct notifier_block wdt_gpi_shutdown = {
.notifier_call = wdt_gpi_notify,
};
/* Init & exit procedures */ /* Init & exit procedures */
static const struct resource * static const struct resource *
wdt_gpi_get_resource(struct platform_device *pdv, const char *name, wdt_gpi_get_resource(struct platform_device *pdv, const char *name,