projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] cell: add RAS support
[powerpc.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
scanlog.c
diff --git
a/arch/powerpc/platforms/pseries/scanlog.c
b/arch/powerpc/platforms/pseries/scanlog.c
index
2edc947
..
77a5bb1
100644
(file)
--- a/
arch/powerpc/platforms/pseries/scanlog.c
+++ b/
arch/powerpc/platforms/pseries/scanlog.c
@@
-107,9
+107,9
@@
static ssize_t scanlog_read(struct file *file, char __user *buf,
/* Break to sleep default time */
break;
default:
/* Break to sleep default time */
break;
default:
- if (status > 9900 && status <= 9905) {
-
wait_time = rtas_extended
_busy_delay_time(status);
-
} else
{
+ /* Assume extended busy */
+
wait_time = rtas
_busy_delay_time(status);
+
if (!wait_time)
{
printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status);
return -EIO;
}
printk(KERN_ERR "scanlog: unknown error from rtas: %d\n", status);
return -EIO;
}
@@
-192,7
+192,7
@@
struct file_operations scanlog_fops = {
.release = scanlog_release,
};
.release = scanlog_release,
};
-int __init scanlog_init(void)
+
static
int __init scanlog_init(void)
{
struct proc_dir_entry *ent;
{
struct proc_dir_entry *ent;
@@
-222,7
+222,7
@@
int __init scanlog_init(void)
return 0;
}
return 0;
}
-void __exit scanlog_cleanup(void)
+
static
void __exit scanlog_cleanup(void)
{
if (proc_ppc64_scan_log_dump) {
kfree(proc_ppc64_scan_log_dump->data);
{
if (proc_ppc64_scan_log_dump) {
kfree(proc_ppc64_scan_log_dump->data);