Merge tag 'for-linus-4.3-merge-window-part-1' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / spmi / spmi.c

diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c
index 94938436aef9c7313403882141a8fc1858413190..11467e17bdd8fcf464140ab8706f1bb3ed7095b2 100644 (file)
--- a/drivers/spmi/spmi.c
+++ b/drivers/spmi/spmi.c
@@ -22,6 +22,8 @@
 #include <linux/pm_runtime.h>
 
 #include <dt-bindings/spmi/spmi.h>
+#define CREATE_TRACE_POINTS
+#include <trace/events/spmi.h>
 
 static DEFINE_IDA(ctrl_ida);
 
@@ -96,28 +98,42 @@ EXPORT_SYMBOL_GPL(spmi_device_remove);
 static inline int
 spmi_cmd(struct spmi_controller *ctrl, u8 opcode, u8 sid)
 {
+       int ret;
+
        if (!ctrl || !ctrl->cmd || ctrl->dev.type != &spmi_ctrl_type)
                return -EINVAL;
 
-       return ctrl->cmd(ctrl, opcode, sid);
+       ret = ctrl->cmd(ctrl, opcode, sid);
+       trace_spmi_cmd(opcode, sid, ret);
+       return ret;
 }
 
 static inline int spmi_read_cmd(struct spmi_controller *ctrl, u8 opcode,
                                u8 sid, u16 addr, u8 *buf, size_t len)
 {
+       int ret;
+
        if (!ctrl || !ctrl->read_cmd || ctrl->dev.type != &spmi_ctrl_type)
                return -EINVAL;
 
-       return ctrl->read_cmd(ctrl, opcode, sid, addr, buf, len);
+       trace_spmi_read_begin(opcode, sid, addr);
+       ret = ctrl->read_cmd(ctrl, opcode, sid, addr, buf, len);
+       trace_spmi_read_end(opcode, sid, addr, ret, len, buf);
+       return ret;
 }
 
 static inline int spmi_write_cmd(struct spmi_controller *ctrl, u8 opcode,
                                 u8 sid, u16 addr, const u8 *buf, size_t len)
 {
+       int ret;
+
        if (!ctrl || !ctrl->write_cmd || ctrl->dev.type != &spmi_ctrl_type)
                return -EINVAL;
 
-       return ctrl->write_cmd(ctrl, opcode, sid, addr, buf, len);
+       trace_spmi_write_begin(opcode, sid, addr, len, buf);
+       ret = ctrl->write_cmd(ctrl, opcode, sid, addr, buf, len);
+       trace_spmi_write_end(opcode, sid, addr, ret);
+       return ret;
 }
 
 /**