git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
rtasd.c
diff --git
a/arch/powerpc/platforms/pseries/rtasd.c
b/arch/powerpc/platforms/pseries/rtasd.c
index
fcc4d56
..
8ca2612
100644
(file)
--- a/
arch/powerpc/platforms/pseries/rtasd.c
+++ b/
arch/powerpc/platforms/pseries/rtasd.c
@@
-348,7
+348,7
@@
static int enable_surveillance(int timeout)
return 0;
if (error == -EINVAL) {
return 0;
if (error == -EINVAL) {
- printk(KERN_
INFO
"rtasd: surveillance not supported\n");
+ printk(KERN_
DEBUG
"rtasd: surveillance not supported\n");
return 0;
}
return 0;
}
@@
-359,11
+359,11
@@
static int enable_surveillance(int timeout)
static int get_eventscan_parms(void)
{
struct device_node *node;
static int get_eventscan_parms(void)
{
struct device_node *node;
- int *ip;
+
const
int *ip;
node = of_find_node_by_path("/rtas");
node = of_find_node_by_path("/rtas");
- ip =
(int *)
get_property(node, "rtas-event-scan-rate", NULL);
+ ip = get_property(node, "rtas-event-scan-rate", NULL);
if (ip == NULL) {
printk(KERN_ERR "rtasd: no rtas-event-scan-rate\n");
of_node_put(node);
if (ip == NULL) {
printk(KERN_ERR "rtasd: no rtas-event-scan-rate\n");
of_node_put(node);
@@
-440,7
+440,7
@@
static int rtasd(void *unused)
goto error;
}
goto error;
}
- printk(KERN_
INFO
"RTAS daemon started\n");
+ printk(KERN_
DEBUG
"RTAS daemon started\n");
DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));
DEBUG("will sleep for %d milliseconds\n", (30000/rtas_event_scan_rate));
@@
-487,8
+487,8
@@
static int __init rtas_init(void)
/* No RTAS */
if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
/* No RTAS */
if (rtas_token("event-scan") == RTAS_UNKNOWN_SERVICE) {
- printk(KERN_
INFO
"rtasd: no event-scan on system\n");
- return
1
;
+ printk(KERN_
DEBUG
"rtasd: no event-scan on system\n");
+ return
-ENODEV
;
}
entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);
}
entry = create_proc_entry("ppc64/rtas/error_log", S_IRUSR, NULL);