Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9b9dbcca authored by Alan Cox's avatar Alan Cox Committed by Wim Van Sebroeck
Browse files

[WATCHDOG 15/57] indydog: Clean up and tidy 



Switch to unlocked_ioctl as well

Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 02355c32

drivers/watchdog/indydog.c

+62 −52
Original line number Diff line number Diff line 
/*

 *	IndyDog	0.3	A Hardware Watchdog Device for SGI IP22

 *

 *	(c) Copyright 2002 Guido Guenther <agx@sigxcpu.org>, All Rights Reserved.

 *	(c) Copyright 2002 Guido Guenther <agx@sigxcpu.org>,

 *						All Rights Reserved.

 *

 *	This program is free software; you can redistribute it and/or

 *	modify it under the terms of the GNU General Public License
@@ -22,32 +23,42 @@ 
#include <linux/notifier.h>

#include <linux/reboot.h>

#include <linux/init.h>

#include <asm/uaccess.h>

#include <linux/uaccess.h>

#include <asm/sgi/mc.h>



#define PFX "indydog: "

static int indydog_alive;

static unsigned long indydog_alive;

static spinlock_t indydog_lock;



#define WATCHDOG_TIMEOUT 30		/* 30 sec default timeout */



static int nowayout = WATCHDOG_NOWAYOUT;

module_param(nowayout, int, 0);

MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")");

MODULE_PARM_DESC(nowayout,

		"Watchdog cannot be stopped once started (default="

				__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");



static void indydog_start(void)

{

	u32 mc_ctrl0 = sgimc->cpuctrl0;

	u32 mc_ctrl0;



	spin_lock(&indydog_lock);

	mc_ctrl0 = sgimc->cpuctrl0;

	mc_ctrl0 = sgimc->cpuctrl0 | SGIMC_CCTRL0_WDOG;

	sgimc->cpuctrl0 = mc_ctrl0;

	spin_unlock(&indydog_lock);

}



static void indydog_stop(void)

{

	u32 mc_ctrl0 = sgimc->cpuctrl0;

	u32 mc_ctrl0;



	spin_lock(&indydog_lock);



	mc_ctrl0 = sgimc->cpuctrl0;

	mc_ctrl0 &= ~SGIMC_CCTRL0_WDOG;

	sgimc->cpuctrl0 = mc_ctrl0;

	spin_unlock(&indydog_lock);



	printk(KERN_INFO PFX "Stopped watchdog timer.\n");

}
@@ -62,7 +73,7 @@ static void indydog_ping(void) 
 */

static int indydog_open(struct inode *inode, struct file *file)

{

	if (indydog_alive)

	if (test_and_set_bit(0, &indydog_alive))

		return -EBUSY;



	if (nowayout)
@@ -84,23 +95,21 @@ static int indydog_release(struct inode *inode, struct file *file) 
	 * Lock it in if it's a module and we defined ...NOWAYOUT */

	if (!nowayout)

		indydog_stop();		/* Turn the WDT off */



	indydog_alive = 0;



	clear_bit(0, &indydog_alive);

	return 0;

}



static ssize_t indydog_write(struct file *file, const char *data, size_t len, loff_t *ppos)

static ssize_t indydog_write(struct file *file, const char *data,

						size_t len, loff_t *ppos)

{

	/* Refresh the timer. */

	if (len) {

	if (len)

		indydog_ping();

	}

	return len;

}



static int indydog_ioctl(struct inode *inode, struct file *file,

	unsigned int cmd, unsigned long arg)

static long indydog_ioctl(struct file *file, unsigned int cmd,

							unsigned long arg)

{

	int options, retval = -EINVAL;

	static struct watchdog_info ident = {
@@ -111,8 +120,6 @@ static int indydog_ioctl(struct inode *inode, struct file *file, 
	};



	switch (cmd) {

		default:

			return -ENOTTY;

	case WDIOC_GETSUPPORT:

		if (copy_to_user((struct watchdog_info *)arg,

				 &ident, sizeof(ident)))
@@ -130,23 +137,23 @@ static int indydog_ioctl(struct inode *inode, struct file *file, 
	{

		if (get_user(options, (int *)arg))

			return -EFAULT;



		if (options & WDIOS_DISABLECARD) {

			indydog_stop();

			retval = 0;

		}



		if (options & WDIOS_ENABLECARD) {

			indydog_start();

			retval = 0;

		}



		return retval;

	}

	default:

		return -ENOTTY;

	}

}



static int indydog_notify_sys(struct notifier_block *this, unsigned long code, void *unused)

static int indydog_notify_sys(struct notifier_block *this,

					unsigned long code, void *unused)

{

	if (code == SYS_DOWN || code == SYS_HALT)

		indydog_stop();		/* Turn the WDT off */
@@ -158,7 +165,7 @@ static const struct file_operations indydog_fops = { 
	.owner		= THIS_MODULE,

	.llseek		= no_llseek,

	.write		= indydog_write,

	.ioctl		= indydog_ioctl,

	.unlocked_ioctl	= indydog_ioctl,

	.open		= indydog_open,

	.release	= indydog_release,

};
@@ -180,16 +187,19 @@ static int __init watchdog_init(void) 
{

	int ret;



	spin_lock_init(&indydog_lock);



	ret = register_reboot_notifier(&indydog_notifier);

	if (ret) {

		printk(KERN_ERR PFX "cannot register reboot notifier (err=%d)\n",

			ret);

		printk(KERN_ERR PFX

			"cannot register reboot notifier (err=%d)\n", ret);

		return ret;

	}



	ret = misc_register(&indydog_miscdev);

	if (ret) {

		printk(KERN_ERR PFX "cannot register miscdev on minor=%d (err=%d)\n",

		printk(KERN_ERR PFX

			"cannot register miscdev on minor=%d (err=%d)\n",

							WATCHDOG_MINOR, ret);

		unregister_reboot_notifier(&indydog_notifier);

		return ret;