From: Robert Richter <robert.richter@amd.com>
Date: Tue, 16 Dec 2008 10:01:18 +0000 (+0100)
Subject: oprofile: simplify add_ibs_begin()
X-Git-Tag: v2.6.29-rc1~32^2~1^2~16
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=dbe6e2835e32461e7d592077947081c32f3da1d5;p=linux-2.6-omap-h63xx.git

oprofile: simplify add_ibs_begin()

Signed-off-by: Robert Richter <robert.richter@amd.com>
---

diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c
index 22cdb510836..7415d2e6b3a 100644
--- a/drivers/oprofile/buffer_sync.c
+++ b/drivers/oprofile/buffer_sync.c
@@ -333,7 +333,7 @@ static void add_ibs_begin(int cpu, int code, struct mm_struct *mm)
 
 	sample = op_cpu_buffer_read_entry(cpu);
 	if (!sample)
-		goto Error;
+		return;
 	rip = sample->eip;
 
 #ifdef __LP64__
@@ -372,15 +372,12 @@ static void add_ibs_begin(int cpu, int code, struct mm_struct *mm)
 	for (i = 0; i < count; i++) {
 		sample = op_cpu_buffer_read_entry(cpu);
 		if (!sample)
-			goto Error;
+			return;
 		add_event_entry(sample->eip);
 		add_event_entry(sample->event);
 	}
 
 	return;
-
-Error:
-	return;
 }
 
 #endif