redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

[WATCHDOG 54/57] wdrtas: clean up, coding style, switch to unlocked_ioctl 

Review and switch to unlocked_ioctl

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
hifive-unleashed-5.1
Alan Cox 2008-05-19 14:09:45 +01:00 committed by Wim Van Sebroeck
parent 694b16b2bd
commit dae67a2835
1 changed files with 41 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
drivers/watchdog/wdrtas.c
View File

@ -35,9 +35,9 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/watchdog.h> #include <linux/watchdog.h>
#include <linux/uaccess.h>
#include <asm/rtas.h> #include <asm/rtas.h>
#include <asm/uaccess.h>
#define WDRTAS_MAGIC_CHAR 42 #define WDRTAS_MAGIC_CHAR 42
#define WDRTAS_SUPPORTED_MASK (WDIOF_SETTIMEOUT | \ #define WDRTAS_SUPPORTED_MASK (WDIOF_SETTIMEOUT | \
@ -56,7 +56,7 @@ static int wdrtas_nowayout = 0;
#endif #endif
static atomic_t wdrtas_miscdev_open = ATOMIC_INIT(0); static atomic_t wdrtas_miscdev_open = ATOMIC_INIT(0);
static char wdrtas_expect_close = 0; static char wdrtas_expect_close;
static int wdrtas_interval; static int wdrtas_interval;
@ -86,8 +86,8 @@ static char wdrtas_logbuffer[WDRTAS_LOGBUFFER_LEN];
* RTAS function set-indicator (surveillance). The unit of interval is * RTAS function set-indicator (surveillance). The unit of interval is
* seconds. * seconds.
*/ */
static int
wdrtas_set_interval(int interval) static int wdrtas_set_interval(int interval)
{ {
long result; long result;
static int print_msg = 10; static int print_msg = 10;
@ -97,7 +97,7 @@ wdrtas_set_interval(int interval)
result = rtas_call(wdrtas_token_set_indicator, 3, 1, NULL, result = rtas_call(wdrtas_token_set_indicator, 3, 1, NULL,
WDRTAS_SURVEILLANCE_IND, 0, interval); WDRTAS_SURVEILLANCE_IND, 0, interval);
if ( (result < 0) && (print_msg) ) { if (result < 0 && print_msg) {
printk(KERN_ERR "wdrtas: setting the watchdog to %i " printk(KERN_ERR "wdrtas: setting the watchdog to %i "
"timeout failed: %li\n", interval, result); "timeout failed: %li\n", interval, result);
print_msg--; print_msg--;
@ -116,16 +116,14 @@ wdrtas_set_interval(int interval)
* as reported by the RTAS function ibm,get-system-parameter. The unit * as reported by the RTAS function ibm,get-system-parameter. The unit
* of the return value is seconds. * of the return value is seconds.
*/ */
static int static int wdrtas_get_interval(int fallback_value)
wdrtas_get_interval(int fallback_value)
{ {
long result; long result;
char value[4]; char value[4];
result = rtas_call(wdrtas_token_get_sp, 3, 1, NULL, result = rtas_call(wdrtas_token_get_sp, 3, 1, NULL,
WDRTAS_SP_SPI, (void *)__pa(&value), 4); WDRTAS_SP_SPI, (void *)__pa(&value), 4);
if ( (value[0] != 0) || (value[1] != 2) || (value[3] != 0) || if (value[0] != 0 || value[1] != 2 || value[3] != 0 || result < 0) {
(result < 0) ) {
printk(KERN_WARNING "wdrtas: could not get sp_spi watchdog " printk(KERN_WARNING "wdrtas: could not get sp_spi watchdog "
"timeout (%li). Continuing\n", result); "timeout (%li). Continuing\n", result);
return fallback_value; return fallback_value;
@ -141,8 +139,7 @@ wdrtas_get_interval(int fallback_value)
* wdrtas_timer_start starts the watchdog by calling the RTAS function * wdrtas_timer_start starts the watchdog by calling the RTAS function
* set-interval (surveillance) * set-interval (surveillance)
*/ */
static void static void wdrtas_timer_start(void)
wdrtas_timer_start(void)
{ {
wdrtas_set_interval(wdrtas_interval); wdrtas_set_interval(wdrtas_interval);
} }
@ -153,8 +150,7 @@ wdrtas_timer_start(void)
* wdrtas_timer_stop stops the watchdog timer by calling the RTAS function * wdrtas_timer_stop stops the watchdog timer by calling the RTAS function
* set-interval (surveillance) * set-interval (surveillance)
*/ */
static void static void wdrtas_timer_stop(void)
wdrtas_timer_stop(void)
{ {
wdrtas_set_interval(0); wdrtas_set_interval(0);
} }
@ -165,8 +161,7 @@ wdrtas_timer_stop(void)
* wdrtas_log_scanned_event prints a message to the log buffer dumping * wdrtas_log_scanned_event prints a message to the log buffer dumping
* the results of the last event-scan call * the results of the last event-scan call
*/ */
static void static void wdrtas_log_scanned_event(void)
wdrtas_log_scanned_event(void)
{ {
int i; int i;
@ -175,13 +170,13 @@ wdrtas_log_scanned_event(void)
"%02x %02x %02x %02x %02x %02x %02x %02x " "%02x %02x %02x %02x %02x %02x %02x %02x "
"%02x %02x %02x %02x %02x %02x %02x %02x\n", "%02x %02x %02x %02x %02x %02x %02x %02x\n",
(i / 16) + 1, (WDRTAS_LOGBUFFER_LEN / 16), (i / 16) + 1, (WDRTAS_LOGBUFFER_LEN / 16),
wdrtas_logbuffer[i + 0], wdrtas_logbuffer[i + 1], wdrtas_logbuffer[i + 0], wdrtas_logbuffer[i + 1],
wdrtas_logbuffer[i + 2], wdrtas_logbuffer[i + 3], wdrtas_logbuffer[i + 2], wdrtas_logbuffer[i + 3],
wdrtas_logbuffer[i + 4], wdrtas_logbuffer[i + 5], wdrtas_logbuffer[i + 4], wdrtas_logbuffer[i + 5],
wdrtas_logbuffer[i + 6], wdrtas_logbuffer[i + 7], wdrtas_logbuffer[i + 6], wdrtas_logbuffer[i + 7],
wdrtas_logbuffer[i + 8], wdrtas_logbuffer[i + 9], wdrtas_logbuffer[i + 8], wdrtas_logbuffer[i + 9],
wdrtas_logbuffer[i + 10], wdrtas_logbuffer[i + 11], wdrtas_logbuffer[i + 10], wdrtas_logbuffer[i + 11],
wdrtas_logbuffer[i + 12], wdrtas_logbuffer[i + 13], wdrtas_logbuffer[i + 12], wdrtas_logbuffer[i + 13],
wdrtas_logbuffer[i + 14], wdrtas_logbuffer[i + 15]); wdrtas_logbuffer[i + 14], wdrtas_logbuffer[i + 15]);
} }
@ -192,8 +187,7 @@ wdrtas_log_scanned_event(void)
* RTAS function event-scan and repeats these calls as long as there are * RTAS function event-scan and repeats these calls as long as there are
* events available. All events will be dumped. * events available. All events will be dumped.
*/ */
static void static void wdrtas_timer_keepalive(void)
wdrtas_timer_keepalive(void)
{ {
long result; long result;
@ -218,8 +212,7 @@ wdrtas_timer_keepalive(void)
* wdrtas_get_temperature returns the current temperature in Fahrenheit. It * wdrtas_get_temperature returns the current temperature in Fahrenheit. It
* uses the RTAS call get-sensor-state, token 3 to do so * uses the RTAS call get-sensor-state, token 3 to do so
*/ */
static int static int wdrtas_get_temperature(void)
wdrtas_get_temperature(void)
{ {
long result; long result;
int temperature = 0; int temperature = 0;
@ -243,8 +236,7 @@ wdrtas_get_temperature(void)
* returns a bitmask of defines WDIOF_... as defined in * returns a bitmask of defines WDIOF_... as defined in
* include/linux/watchdog.h * include/linux/watchdog.h
*/ */
static int static int wdrtas_get_status(void)
wdrtas_get_status(void)
{ {
return 0; /* TODO */ return 0; /* TODO */
} }
@ -255,8 +247,7 @@ wdrtas_get_status(void)
* returns a bitmask of defines WDIOF_... as defined in * returns a bitmask of defines WDIOF_... as defined in
* include/linux/watchdog.h, indicating why the watchdog rebooted the system * include/linux/watchdog.h, indicating why the watchdog rebooted the system
*/ */
static int static int wdrtas_get_boot_status(void)
wdrtas_get_boot_status(void)
{ {
return 0; /* TODO */ return 0; /* TODO */
} }
@ -276,8 +267,7 @@ wdrtas_get_boot_status(void)
* character 'V'. This character allows the watchdog device to be closed * character 'V'. This character allows the watchdog device to be closed
* properly. * properly.
*/ */
static ssize_t static ssize_t wdrtas_write(struct file *file, const char __user *buf,
wdrtas_write(struct file *file, const char __user *buf,
size_t len, loff_t *ppos) size_t len, loff_t *ppos)
{ {
int i; int i;
@ -306,7 +296,6 @@ out:
/** /**
* wdrtas_ioctl - ioctl function for the watchdog device * wdrtas_ioctl - ioctl function for the watchdog device
* @inode: inode structure
* @file: file structure * @file: file structure
* @cmd: command for ioctl * @cmd: command for ioctl
* @arg: argument pointer * @arg: argument pointer
@ -315,9 +304,9 @@ out:
* *
* wdrtas_ioctl implements the watchdog API ioctls * wdrtas_ioctl implements the watchdog API ioctls
*/ */
static int
wdrtas_ioctl(struct inode *inode, struct file *file, static long wdrtas_ioctl(struct file *file, unsigned int cmd,
unsigned int cmd, unsigned long arg) unsigned long arg)
{ {
int __user *argp = (void __user *)arg; int __user *argp = (void __user *)arg;
int i; int i;
@ -357,9 +346,9 @@ wdrtas_ioctl(struct inode *inode, struct file *file,
wdrtas_timer_keepalive(); wdrtas_timer_keepalive();
wdrtas_timer_start(); wdrtas_timer_start();
} }
/* not implemented. Done by H8
if (i & WDIOS_TEMPPANIC) { if (i & WDIOS_TEMPPANIC) {
/* not implemented. Done by H8 */ } */
}
return 0; return 0;
case WDIOC_KEEPALIVE: case WDIOC_KEEPALIVE:
@ -399,8 +388,7 @@ wdrtas_ioctl(struct inode *inode, struct file *file,
* *
* function called when watchdog device is opened * function called when watchdog device is opened
*/ */
static int static int wdrtas_open(struct inode *inode, struct file *file)
wdrtas_open(struct inode *inode, struct file *file)
{ {
/* only open once */ /* only open once */
if (atomic_inc_return(&wdrtas_miscdev_open) > 1) { if (atomic_inc_return(&wdrtas_miscdev_open) > 1) {
@ -423,8 +411,7 @@ wdrtas_open(struct inode *inode, struct file *file)
* *
* close function. Always succeeds * close function. Always succeeds
*/ */
static int static int wdrtas_close(struct inode *inode, struct file *file)
wdrtas_close(struct inode *inode, struct file *file)
{ {
/* only stop watchdog, if this was announced using 'V' before */ /* only stop watchdog, if this was announced using 'V' before */
if (wdrtas_expect_close == WDRTAS_MAGIC_CHAR) if (wdrtas_expect_close == WDRTAS_MAGIC_CHAR)
@ -453,8 +440,7 @@ wdrtas_close(struct inode *inode, struct file *file)
* wdrtas_temp_read gives the temperature to the users by copying this * wdrtas_temp_read gives the temperature to the users by copying this
* value as one byte into the user space buffer. The unit is Fahrenheit... * value as one byte into the user space buffer. The unit is Fahrenheit...
*/ */
static ssize_t static ssize_t wdrtas_temp_read(struct file *file, char __user *buf,
wdrtas_temp_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos) size_t count, loff_t *ppos)
{ {
int temperature = 0; int temperature = 0;
@ -478,8 +464,7 @@ wdrtas_temp_read(struct file *file, char __user *buf,
* *
* function called when temperature device is opened * function called when temperature device is opened
*/ */
static int static int wdrtas_temp_open(struct inode *inode, struct file *file)
wdrtas_temp_open(struct inode *inode, struct file *file)
{ {
return nonseekable_open(inode, file); return nonseekable_open(inode, file);
} }
@ -493,8 +478,7 @@ wdrtas_temp_open(struct inode *inode, struct file *file)
* *
* close function. Always succeeds * close function. Always succeeds
*/ */
static int static int wdrtas_temp_close(struct inode *inode, struct file *file)
wdrtas_temp_close(struct inode *inode, struct file *file)
{ {
return 0; return 0;
} }
@ -509,10 +493,10 @@ wdrtas_temp_close(struct inode *inode, struct file *file)
* *
* wdrtas_reboot stops the watchdog in case of a reboot * wdrtas_reboot stops the watchdog in case of a reboot
*/ */
static int static int wdrtas_reboot(struct notifier_block *this,
wdrtas_reboot(struct notifier_block *this, unsigned long code, void *ptr) unsigned long code, void *ptr)
{ {
if ( (code==SYS_DOWN) || (code==SYS_HALT) ) if (code == SYS_DOWN || code == SYS_HALT)
wdrtas_timer_stop(); wdrtas_timer_stop();
return NOTIFY_DONE; return NOTIFY_DONE;
@ -524,7 +508,7 @@ static const struct file_operations wdrtas_fops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.llseek = no_llseek, .llseek = no_llseek,
.write = wdrtas_write, .write = wdrtas_write,
.ioctl = wdrtas_ioctl, .unlocked_ioctl = wdrtas_ioctl,
.open = wdrtas_open, .open = wdrtas_open,
.release = wdrtas_close, .release = wdrtas_close,
}; };
@ -562,8 +546,7 @@ static struct notifier_block wdrtas_notifier = {
* this watchdog driver. It tolerates, if "get-sensor-state" and * this watchdog driver. It tolerates, if "get-sensor-state" and
* "ibm,get-system-parameter" are not available. * "ibm,get-system-parameter" are not available.
*/ */
static int static int wdrtas_get_tokens(void)
wdrtas_get_tokens(void)
{ {
wdrtas_token_get_sensor_state = rtas_token("get-sensor-state"); wdrtas_token_get_sensor_state = rtas_token("get-sensor-state");
if (wdrtas_token_get_sensor_state == RTAS_UNKNOWN_SERVICE) { if (wdrtas_token_get_sensor_state == RTAS_UNKNOWN_SERVICE) {
@ -603,8 +586,7 @@ wdrtas_get_tokens(void)
* wdrtas_register_devs unregisters the watchdog and temperature watchdog * wdrtas_register_devs unregisters the watchdog and temperature watchdog
* misc devs * misc devs
*/ */
static void static void wdrtas_unregister_devs(void)
wdrtas_unregister_devs(void)
{ {
misc_deregister(&wdrtas_miscdev); misc_deregister(&wdrtas_miscdev);
if (wdrtas_token_get_sensor_state != RTAS_UNKNOWN_SERVICE) if (wdrtas_token_get_sensor_state != RTAS_UNKNOWN_SERVICE)
@ -619,8 +601,7 @@ wdrtas_unregister_devs(void)
* wdrtas_register_devs registers the watchdog and temperature watchdog * wdrtas_register_devs registers the watchdog and temperature watchdog
* misc devs * misc devs
*/ */
static int static int wdrtas_register_devs(void)
wdrtas_register_devs(void)
{ {
int result; int result;
@ -651,8 +632,7 @@ wdrtas_register_devs(void)
* *
* registers the file handlers and the reboot notifier * registers the file handlers and the reboot notifier
*/ */
static int __init static int __init wdrtas_init(void)
wdrtas_init(void)
{ {
if (wdrtas_get_tokens()) if (wdrtas_get_tokens())
return -ENODEV; return -ENODEV;
@ -680,8 +660,7 @@ wdrtas_init(void)
* *
* unregisters the file handlers and the reboot notifier * unregisters the file handlers and the reboot notifier
*/ */
static void __exit static void __exit wdrtas_exit(void)
wdrtas_exit(void)
{ {
if (!wdrtas_nowayout) if (!wdrtas_nowayout)
wdrtas_timer_stop(); wdrtas_timer_stop();