linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Fix misleading indentation issues in perf
@ 2015-12-12 18:07 Markus Trippelsdorf
  2015-12-14  8:19 ` Ingo Molnar
  2015-12-14 10:46 ` Matt Fleming
  0 siblings, 2 replies; 11+ messages in thread
From: Markus Trippelsdorf @ 2015-12-12 18:07 UTC (permalink / raw)
  To: Matt Fleming
  Cc: Arnaldo Carvalho de Melo, linux-kernel, Ingo Molnar, Peter Zijlstra

perf doesn't build with gcc-6 because of several misleading-indentation
warnings, e.g.:

arch/x86/tests/intel-cqm.c: In function ‘spawn’:
arch/x86/tests/intel-cqm.c:21:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
   sleep(5);
   ^~~~~

arch/x86/tests/intel-cqm.c:20:2: note: ...this ‘while’ clause, but it is not
  while(1);
  ^~~~~

Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>

diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
index d28c1b6a3b54..fa5d17af88b7 100644
--- a/tools/perf/arch/x86/tests/intel-cqm.c
+++ b/tools/perf/arch/x86/tests/intel-cqm.c
@@ -17,7 +17,7 @@ static pid_t spawn(void)
 	if (pid)
 		return pid;
 
-	while(1);
+	while(1)
 		sleep(5);
 	return 0;
 }
diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index d4d7cc27252f..718bd46d47fa 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -755,11 +755,11 @@ static int annotate_browser__run(struct annotate_browser *browser,
 				nd = browser->curr_hot;
 			break;
 		case K_UNTAB:
-			if (nd != NULL)
+			if (nd != NULL) {
 				nd = rb_next(nd);
 				if (nd == NULL)
 					nd = rb_first(&browser->entries);
-			else
+			} else
 				nd = browser->curr_hot;
 			break;
 		case K_F1:
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index e4b173dec4b9..c900b664ab8f 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -153,7 +153,7 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
 	if (fd == -1)
 		return -1;
 
-		sret = read(fd, alias->unit, UNIT_MAX_LEN);
+	sret = read(fd, alias->unit, UNIT_MAX_LEN);
 	if (sret < 0)
 		goto error;
 
-- 
Markus

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* Re: [PATCH] Fix misleading indentation issues in perf
  2015-12-12 18:07 [PATCH] Fix misleading indentation issues in perf Markus Trippelsdorf
@ 2015-12-14  8:19 ` Ingo Molnar
  2015-12-14 10:46 ` Matt Fleming
  1 sibling, 0 replies; 11+ messages in thread
From: Ingo Molnar @ 2015-12-14  8:19 UTC (permalink / raw)
  To: Markus Trippelsdorf
  Cc: Matt Fleming, Arnaldo Carvalho de Melo, linux-kernel,
	Ingo Molnar, Peter Zijlstra


* Markus Trippelsdorf <markus@trippelsdorf.de> wrote:

> perf doesn't build with gcc-6 because of several misleading-indentation
> warnings, e.g.:
> 
> arch/x86/tests/intel-cqm.c: In function ‘spawn’:
> arch/x86/tests/intel-cqm.c:21:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
>    sleep(5);
>    ^~~~~
> 
> arch/x86/tests/intel-cqm.c:20:2: note: ...this ‘while’ clause, but it is not
>   while(1);
>   ^~~~~

Nice warnings!

> diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
> index d28c1b6a3b54..fa5d17af88b7 100644
> --- a/tools/perf/arch/x86/tests/intel-cqm.c
> +++ b/tools/perf/arch/x86/tests/intel-cqm.c
> @@ -17,7 +17,7 @@ static pid_t spawn(void)
>  	if (pid)
>  		return pid;
>  
> -	while(1);
> +	while(1)
>  		sleep(5);

looks like it caught a real bug here.


>  		case K_UNTAB:
> -			if (nd != NULL)
> +			if (nd != NULL) {
>  				nd = rb_next(nd);
>  				if (nd == NULL)
>  					nd = rb_first(&browser->entries);
> -			else
> +			} else
>  				nd = browser->curr_hot;
>  			break;

That looks like a real bug as well AFAICS.

>  		case K_F1:
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index e4b173dec4b9..c900b664ab8f 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -153,7 +153,7 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
>  	if (fd == -1)
>  		return -1;
>  
> -		sret = read(fd, alias->unit, UNIT_MAX_LEN);
> +	sret = read(fd, alias->unit, UNIT_MAX_LEN);
>  	if (sret < 0)
>  		goto error;

This is just whitespace noise, but annoying.

Cool compiler feature.

Thanks,

	Ingo

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH] Fix misleading indentation issues in perf
  2015-12-12 18:07 [PATCH] Fix misleading indentation issues in perf Markus Trippelsdorf
  2015-12-14  8:19 ` Ingo Molnar
@ 2015-12-14 10:46 ` Matt Fleming
  2015-12-14 15:14   ` Arnaldo Carvalho de Melo
  1 sibling, 1 reply; 11+ messages in thread
From: Matt Fleming @ 2015-12-14 10:46 UTC (permalink / raw)
  To: Markus Trippelsdorf
  Cc: Arnaldo Carvalho de Melo, linux-kernel, Ingo Molnar, Peter Zijlstra

On Sat, 12 Dec, at 07:07:02PM, Markus Trippelsdorf wrote:
> perf doesn't build with gcc-6 because of several misleading-indentation
> warnings, e.g.:
> 
> arch/x86/tests/intel-cqm.c: In function ‘spawn’:
> arch/x86/tests/intel-cqm.c:21:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
>    sleep(5);
>    ^~~~~
> 
> arch/x86/tests/intel-cqm.c:20:2: note: ...this ‘while’ clause, but it is not
>   while(1);
>   ^~~~~
> 
> Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
> 
> diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
> index d28c1b6a3b54..fa5d17af88b7 100644
> --- a/tools/perf/arch/x86/tests/intel-cqm.c
> +++ b/tools/perf/arch/x86/tests/intel-cqm.c
> @@ -17,7 +17,7 @@ static pid_t spawn(void)
>  	if (pid)
>  		return pid;
>  
> -	while(1);
> +	while(1)
>  		sleep(5);
>  	return 0;
>  }

Whoops. Good catch.

Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH] Fix misleading indentation issues in perf
  2015-12-14 10:46 ` Matt Fleming
@ 2015-12-14 15:14   ` Arnaldo Carvalho de Melo
  2015-12-14 15:43     ` [PATCH 1/3] Remove wrong semicolon in while loop Markus Trippelsdorf
                       ` (2 more replies)
  0 siblings, 3 replies; 11+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-12-14 15:14 UTC (permalink / raw)
  To: Matt Fleming
  Cc: Markus Trippelsdorf, linux-kernel, Ingo Molnar, Peter Zijlstra

Em Mon, Dec 14, 2015 at 10:46:07AM +0000, Matt Fleming escreveu:
> On Sat, 12 Dec, at 07:07:02PM, Markus Trippelsdorf wrote:
> > perf doesn't build with gcc-6 because of several misleading-indentation
> > warnings, e.g.:
> > 
> > arch/x86/tests/intel-cqm.c: In function ‘spawn’:
> > arch/x86/tests/intel-cqm.c:21:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]
> >    sleep(5);
> >    ^~~~~
> > 
> > arch/x86/tests/intel-cqm.c:20:2: note: ...this ‘while’ clause, but it is not
> >   while(1);
> >   ^~~~~
> > 
> > Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
> > 
> > diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
> > index d28c1b6a3b54..fa5d17af88b7 100644
> > --- a/tools/perf/arch/x86/tests/intel-cqm.c
> > +++ b/tools/perf/arch/x86/tests/intel-cqm.c
> > @@ -17,7 +17,7 @@ static pid_t spawn(void)
> >  	if (pid)
> >  		return pid;
> >  
> > -	while(1);
> > +	while(1)
> >  		sleep(5);
> >  	return 0;
> >  }
> 
> Whoops. Good catch.
> 
> Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>

So, Markus, can you split this in three patches, stating that in some
cases its just cosmetic stuff while in others really a bug got fixed,
adding the Reviewed-by:  tag for the cqm one? And acked-by for all, from
Ingo?

- Arnaldo

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [PATCH 1/3] Remove wrong semicolon in while loop
  2015-12-14 15:14   ` Arnaldo Carvalho de Melo
@ 2015-12-14 15:43     ` Markus Trippelsdorf
  2015-12-14 17:55       ` Arnaldo Carvalho de Melo
  2016-01-30  8:24       ` [tip:perf/urgent] perf tests: Remove wrong semicolon in while loop in CQM test tip-bot for Markus Trippelsdorf
  2015-12-14 15:44     ` [PATCH 2/3] Add missing braces to if statement Markus Trippelsdorf
  2015-12-14 15:44     ` [PATCH 3/3] Fix misleadingly indented assignment (whitespace) Markus Trippelsdorf
  2 siblings, 2 replies; 11+ messages in thread
From: Markus Trippelsdorf @ 2015-12-14 15:43 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Matt Fleming, linux-kernel, Ingo Molnar, Peter Zijlstra

The while loop was spinning. Fix by removing a semicolon.

The issue was pointed out by gcc-6's -Wmisleading-indentation.

Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>

diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
index d28c1b6a3b54..fa5d17af88b7 100644
--- a/tools/perf/arch/x86/tests/intel-cqm.c
+++ b/tools/perf/arch/x86/tests/intel-cqm.c
@@ -17,7 +17,7 @@ static pid_t spawn(void)
 	if (pid)
 		return pid;
 
-	while(1);
+	while(1)
 		sleep(5);
 	return 0;
 }
-- 
Markus

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [PATCH 2/3] Add missing braces to if statement
  2015-12-14 15:14   ` Arnaldo Carvalho de Melo
  2015-12-14 15:43     ` [PATCH 1/3] Remove wrong semicolon in while loop Markus Trippelsdorf
@ 2015-12-14 15:44     ` Markus Trippelsdorf
  2016-01-30  8:24       ` [tip:perf/urgent] perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed tip-bot for Markus Trippelsdorf
  2015-12-14 15:44     ` [PATCH 3/3] Fix misleadingly indented assignment (whitespace) Markus Trippelsdorf
  2 siblings, 1 reply; 11+ messages in thread
From: Markus Trippelsdorf @ 2015-12-14 15:44 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Matt Fleming, linux-kernel, Ingo Molnar, Peter Zijlstra

Add missing braces to if statement.

The issue was pointed out by gcc-6's -Wmisleading-indentation.

Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index d4d7cc27252f..718bd46d47fa 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -755,11 +755,11 @@ static int annotate_browser__run(struct annotate_browser *browser,
 				nd = browser->curr_hot;
 			break;
 		case K_UNTAB:
-			if (nd != NULL)
+			if (nd != NULL) {
 				nd = rb_next(nd);
 				if (nd == NULL)
 					nd = rb_first(&browser->entries);
-			else
+			} else
 				nd = browser->curr_hot;
 			break;
 		case K_F1:
-- 
Markus

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [PATCH 3/3] Fix misleadingly indented assignment (whitespace)
  2015-12-14 15:14   ` Arnaldo Carvalho de Melo
  2015-12-14 15:43     ` [PATCH 1/3] Remove wrong semicolon in while loop Markus Trippelsdorf
  2015-12-14 15:44     ` [PATCH 2/3] Add missing braces to if statement Markus Trippelsdorf
@ 2015-12-14 15:44     ` Markus Trippelsdorf
  2016-02-03 10:06       ` [tip:perf/core] perf pmu: Fix misleadingly indented assignment ( whitespace) tip-bot for Markus Trippelsdorf
  2 siblings, 1 reply; 11+ messages in thread
From: Markus Trippelsdorf @ 2015-12-14 15:44 UTC (permalink / raw)
  To: Arnaldo Carvalho de Melo
  Cc: Matt Fleming, linux-kernel, Ingo Molnar, Peter Zijlstra

Fix misleadingly indented assignment.
This is just a simple whitespace fix.

The issue was pointed out by gcc-6's -Wmisleading-indentation.

Acked-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index e4b173dec4b9..c900b664ab8f 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -153,7 +153,7 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
 	if (fd == -1)
 		return -1;
 
-		sret = read(fd, alias->unit, UNIT_MAX_LEN);
+	sret = read(fd, alias->unit, UNIT_MAX_LEN);
 	if (sret < 0)
 		goto error;
 
-- 
Markus

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] Remove wrong semicolon in while loop
  2015-12-14 15:43     ` [PATCH 1/3] Remove wrong semicolon in while loop Markus Trippelsdorf
@ 2015-12-14 17:55       ` Arnaldo Carvalho de Melo
  2016-01-30  8:24       ` [tip:perf/urgent] perf tests: Remove wrong semicolon in while loop in CQM test tip-bot for Markus Trippelsdorf
  1 sibling, 0 replies; 11+ messages in thread
From: Arnaldo Carvalho de Melo @ 2015-12-14 17:55 UTC (permalink / raw)
  To: Markus Trippelsdorf
  Cc: Matt Fleming, linux-kernel, Ingo Molnar, Peter Zijlstra

Em Mon, Dec 14, 2015 at 04:43:35PM +0100, Markus Trippelsdorf escreveu:
> The while loop was spinning. Fix by removing a semicolon.

Thanks for splitting it up!

- Arnaldo

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [tip:perf/urgent] perf tests: Remove wrong semicolon in while loop in CQM test
  2015-12-14 15:43     ` [PATCH 1/3] Remove wrong semicolon in while loop Markus Trippelsdorf
  2015-12-14 17:55       ` Arnaldo Carvalho de Melo
@ 2016-01-30  8:24       ` tip-bot for Markus Trippelsdorf
  1 sibling, 0 replies; 11+ messages in thread
From: tip-bot for Markus Trippelsdorf @ 2016-01-30  8:24 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: linux-kernel, ben, markus, tglx, acme, matt, mingo, peterz, hpa

Commit-ID:  cf89813a5b514bff9b3b5e7eaf2090f22fba62e0
Gitweb:     http://git.kernel.org/tip/cf89813a5b514bff9b3b5e7eaf2090f22fba62e0
Author:     Markus Trippelsdorf <markus@trippelsdorf.de>
AuthorDate: Mon, 14 Dec 2015 16:43:35 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 26 Jan 2016 11:14:06 -0300

perf tests: Remove wrong semicolon in while loop in CQM test

The while loop was spinning. Fix by removing a semicolon.

The issue was pointed out by gcc-6's -Wmisleading-indentation.

Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Reviewed-by: Matt Fleming <matt@codeblueprint.co.uk>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 035827e9f2bd ("perf tests: Add Intel CQM test")
Link: http://lkml.kernel.org/r/20151214154335.GA1409@x4
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/arch/x86/tests/intel-cqm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/arch/x86/tests/intel-cqm.c b/tools/perf/arch/x86/tests/intel-cqm.c
index 3e89ba8..7f064eb 100644
--- a/tools/perf/arch/x86/tests/intel-cqm.c
+++ b/tools/perf/arch/x86/tests/intel-cqm.c
@@ -17,7 +17,7 @@ static pid_t spawn(void)
 	if (pid)
 		return pid;
 
-	while(1);
+	while(1)
 		sleep(5);
 	return 0;
 }

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [tip:perf/urgent] perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed
  2015-12-14 15:44     ` [PATCH 2/3] Add missing braces to if statement Markus Trippelsdorf
@ 2016-01-30  8:24       ` tip-bot for Markus Trippelsdorf
  0 siblings, 0 replies; 11+ messages in thread
From: tip-bot for Markus Trippelsdorf @ 2016-01-30  8:24 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: acme, matt, markus, linux-kernel, peterz, mingo, ben, tglx, hpa

Commit-ID:  d4913cbd05bab685e49c8174896e563b2487d054
Gitweb:     http://git.kernel.org/tip/d4913cbd05bab685e49c8174896e563b2487d054
Author:     Markus Trippelsdorf <markus@trippelsdorf.de>
AuthorDate: Mon, 14 Dec 2015 16:44:03 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 26 Jan 2016 11:14:25 -0300

perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed

The issue was pointed out by gcc-6's -Wmisleading-indentation.

Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: c97cf42219b7 ("perf top: Live TUI Annotation")
Link: http://lkml.kernel.org/r/20151214154403.GB1409@x4
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/ui/browsers/annotate.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/ui/browsers/annotate.c b/tools/perf/ui/browsers/annotate.c
index d4d7cc2..718bd46 100644
--- a/tools/perf/ui/browsers/annotate.c
+++ b/tools/perf/ui/browsers/annotate.c
@@ -755,11 +755,11 @@ static int annotate_browser__run(struct annotate_browser *browser,
 				nd = browser->curr_hot;
 			break;
 		case K_UNTAB:
-			if (nd != NULL)
+			if (nd != NULL) {
 				nd = rb_next(nd);
 				if (nd == NULL)
 					nd = rb_first(&browser->entries);
-			else
+			} else
 				nd = browser->curr_hot;
 			break;
 		case K_F1:

^ permalink raw reply related	[flat|nested] 11+ messages in thread
* [tip:perf/core] perf pmu: Fix misleadingly indented assignment ( whitespace)
  2015-12-14 15:44     ` [PATCH 3/3] Fix misleadingly indented assignment (whitespace) Markus Trippelsdorf
@ 2016-02-03 10:06       ` tip-bot for Markus Trippelsdorf
  0 siblings, 0 replies; 11+ messages in thread
From: tip-bot for Markus Trippelsdorf @ 2016-02-03 10:06 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: matt, tglx, ben, markus, mingo, acme, linux-kernel, hpa, peterz

Commit-ID:  d85ce830eef6c10d1e9617172dea4681f02b8424
Gitweb:     http://git.kernel.org/tip/d85ce830eef6c10d1e9617172dea4681f02b8424
Author:     Markus Trippelsdorf <markus@trippelsdorf.de>
AuthorDate: Mon, 14 Dec 2015 16:44:40 +0100
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Tue, 26 Jan 2016 11:52:42 -0300

perf pmu: Fix misleadingly indented assignment (whitespace)

One line in perf_pmu__parse_unit() is indented wrongly, leading to a
warning (=> error) from gcc 6:

  util/pmu.c:156:3: error: statement is indented as if it were guarded by... [-Werror=misleading-indentation]

    sret = read(fd, alias->unit, UNIT_MAX_LEN);
    ^~~~

  util/pmu.c:153:2: note: ...this 'if' clause, but it is not
    if (fd == -1)
    ^~

Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Ben Hutchings <ben@decadent.org.uk>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Fixes: 410136f5dd96 ("tools/perf/stat: Add event unit and scale support")
Link: http://lkml.kernel.org/r/20151214154440.GC1409@x4
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/pmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index b597bcc..41a9c87 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -153,7 +153,7 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
 	if (fd == -1)
 		return -1;
 
-		sret = read(fd, alias->unit, UNIT_MAX_LEN);
+	sret = read(fd, alias->unit, UNIT_MAX_LEN);
 	if (sret < 0)
 		goto error;
 

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-02-03 10:07 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-12 18:07 [PATCH] Fix misleading indentation issues in perf Markus Trippelsdorf
2015-12-14  8:19 ` Ingo Molnar
2015-12-14 10:46 ` Matt Fleming
2015-12-14 15:14   ` Arnaldo Carvalho de Melo
2015-12-14 15:43     ` [PATCH 1/3] Remove wrong semicolon in while loop Markus Trippelsdorf
2015-12-14 17:55       ` Arnaldo Carvalho de Melo
2016-01-30  8:24       ` [tip:perf/urgent] perf tests: Remove wrong semicolon in while loop in CQM test tip-bot for Markus Trippelsdorf
2015-12-14 15:44     ` [PATCH 2/3] Add missing braces to if statement Markus Trippelsdorf
2016-01-30  8:24       ` [tip:perf/urgent] perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed tip-bot for Markus Trippelsdorf
2015-12-14 15:44     ` [PATCH 3/3] Fix misleadingly indented assignment (whitespace) Markus Trippelsdorf
2016-02-03 10:06       ` [tip:perf/core] perf pmu: Fix misleadingly indented assignment ( whitespace) tip-bot for Markus Trippelsdorf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).