[PATCH 27/37] perf intel-pt: Join needlessly wrapped lines

2017-05-19 Thread Adrian Hunter
Join needlessly wrapped lines.

Signed-off-by: Adrian Hunter 
---
 tools/perf/util/intel-pt.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index f8237a0e2946..b670502b0264 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1298,15 +1298,13 @@ static int intel_pt_sample(struct intel_pt_queue *ptq)
 
ptq->have_sample = false;
 
-   if (pt->sample_instructions &&
-   (state->type & INTEL_PT_INSTRUCTION)) {
+   if (pt->sample_instructions && (state->type & INTEL_PT_INSTRUCTION)) {
err = intel_pt_synth_instruction_sample(ptq);
if (err)
return err;
}
 
-   if (pt->sample_transactions &&
-   (state->type & INTEL_PT_TRANSACTION)) {
+   if (pt->sample_transactions && (state->type & INTEL_PT_TRANSACTION)) {
err = intel_pt_synth_transaction_sample(ptq);
if (err)
return err;
-- 
1.9.1



[PATCH 27/37] perf intel-pt: Join needlessly wrapped lines

2017-05-19 Thread Adrian Hunter
Join needlessly wrapped lines.

Signed-off-by: Adrian Hunter 
---
 tools/perf/util/intel-pt.c | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index f8237a0e2946..b670502b0264 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1298,15 +1298,13 @@ static int intel_pt_sample(struct intel_pt_queue *ptq)
 
ptq->have_sample = false;
 
-   if (pt->sample_instructions &&
-   (state->type & INTEL_PT_INSTRUCTION)) {
+   if (pt->sample_instructions && (state->type & INTEL_PT_INSTRUCTION)) {
err = intel_pt_synth_instruction_sample(ptq);
if (err)
return err;
}
 
-   if (pt->sample_transactions &&
-   (state->type & INTEL_PT_TRANSACTION)) {
+   if (pt->sample_transactions && (state->type & INTEL_PT_TRANSACTION)) {
err = intel_pt_synth_transaction_sample(ptq);
if (err)
return err;
-- 
1.9.1