Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux

[firefly-linux-kernel-4.4.55.git] / drivers / macintosh / via-pmu.c

diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c
index 22b8ce4191ccd69d6b8740c61a71791efafd31bf..283e1b53c6be4ef1d4b3dfbf381b68f5cf1cdbc2 100644 (file)
--- a/drivers/macintosh/via-pmu.c
+++ b/drivers/macintosh/via-pmu.c
@@ -750,8 +750,9 @@ done_battery_state_smart(struct adb_request* req)
                                voltage = (req->reply[8] << 8) | req->reply[9];
                                break;
                        default:
-                               printk(KERN_WARNING "pmu.c : unrecognized battery info, len: %d, %02x %02x %02x %02x\n",
-                                       req->reply_len, req->reply[0], req->reply[1], req->reply[2], req->reply[3]);
+                               pr_warn("pmu.c: unrecognized battery info, "
+                                       "len: %d, %4ph\n", req->reply_len,
+                                                          req->reply);
                                break;
                }
        }
@@ -869,7 +870,7 @@ static int pmu_battery_proc_show(struct seq_file *m, void *v)
 
 static int pmu_battery_proc_open(struct inode *inode, struct file *file)
 {
-       return single_open(file, pmu_battery_proc_show, PDE(inode)->data);
+       return single_open(file, pmu_battery_proc_show, PDE_DATA(inode));
 }
 
 static const struct file_operations pmu_battery_proc_fops = {