To simplify/cleanup code, move the rather long printk() to a separate
function.

Signed-off-by: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com>
---
 arch/powerpc/perf/hv-24x7.c | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c
index c189e75..a58a1df 100644
--- a/arch/powerpc/perf/hv-24x7.c
+++ b/arch/powerpc/perf/hv-24x7.c
@@ -985,6 +985,21 @@ static const struct attribute_group *attr_groups[] = {
        NULL,
 };
 
+static void log_24x7_hcall(struct hv_24x7_request_buffer *request_buffer,
+                       struct hv_24x7_data_result_buffer *result_buffer,
+                       unsigned long ret)
+{
+       struct hv_24x7_request *req;
+
+       req = &request_buffer->requests[0];
+       pr_notice_ratelimited("hcall failed: [%d %#x %#x %d] => "
+                       "ret 0x%lx (%ld) detail=0x%x failing ix=%x\n",
+                       req->performance_domain, req->data_offset,
+                       req->starting_ix, req->starting_lpar_ix, ret, ret,
+                       result_buffer->detailed_rc,
+                       result_buffer->failing_request_ix);
+}
+
 static unsigned long single_24x7_request(struct perf_event *event, u64 *count)
 {
        u16 idx;
@@ -1032,13 +1047,7 @@ static unsigned long single_24x7_request(struct 
perf_event *event, u64 *count)
                        virt_to_phys(result_buffer),  H24x7_DATA_BUFFER_SIZE);
 
        if (ret) {
-               pr_notice_ratelimited("hcall failed: %d %#x %#x %d => "
-                               "0x%lx (%ld) detail=0x%x failing ix=%x\n",
-                               (int)event_get_domain(event),
-                               (unsigned int)event_get_offset(event),
-                               idx, (int)event_get_lpar(event), ret, ret,
-                               result_buffer->detailed_rc,
-                               result_buffer->failing_request_ix);
+               log_24x7_hcall(request_buffer, result_buffer, ret);
                goto out;
        }
 
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to