Pull video into test branch

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / pseries / scanlog.c

diff --git a/arch/powerpc/platforms/pseries/scanlog.c b/arch/powerpc/platforms/pseries/scanlog.c
index 2edc947f7c44b2a9908f43ad098633018dc38bf6..45368a57d7ddd02541a8db3a009031bab995cadb 100644 (file)
--- a/arch/powerpc/platforms/pseries/scanlog.c
+++ b/arch/powerpc/platforms/pseries/scanlog.c
@@ -47,7 +47,7 @@ static struct proc_dir_entry *proc_ppc64_scan_log_dump;       /* The proc file */
 static ssize_t scanlog_read(struct file *file, char __user *buf,
                            size_t count, loff_t *ppos)
 {
-        struct inode * inode = file->f_dentry->d_inode;
+        struct inode * inode = file->f_path.dentry->d_inode;
        struct proc_dir_entry *dp;
        unsigned int *data;
        int status;
@@ -107,9 +107,9 @@ static ssize_t scanlog_read(struct file *file, char __user *buf,
                        /* 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;
                        }
@@ -192,7 +192,7 @@ struct file_operations scanlog_fops = {
        .release        = scanlog_release,
 };
 
-int __init scanlog_init(void)
+static int __init scanlog_init(void)
 {
        struct proc_dir_entry *ent;
 
@@ -222,7 +222,7 @@ int __init scanlog_init(void)
        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);