Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 94414ca0 authored by Julia Lawall's avatar Julia Lawall Committed by Martin Schwidefsky
Browse files

s390/oprofile: make return of 0 explicit 

Delete unnecessary local variable whose value is always 0 and that hides
the fact that the result is always 0.

A simplified version of the semantic patch that fixes this problem is as
follows: (http://coccinelle.lip6.fr/

)

// <smpl>
@r exists@
local idexpression ret;
expression e;
position p;
@@

-ret = 0;
... when != ret = e
return
- ret
+ 0
  ;
// </smpl>

[heiko.carstens: turn prepare_cpu_buffers into a void returning function]
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 470ada6b

arch/s390/oprofile/hwsampler.c

+4 −10
Original line number Diff line number Diff line
@@ -209,13 +209,11 @@ static void init_all_cpu_buffers(void) 
	}

}



static int prepare_cpu_buffers(void)

static void prepare_cpu_buffers(void)

{

	int cpu;

	int rc;

	struct hws_cpu_buffer *cb;

	int cpu;



	rc = 0;

	for_each_online_cpu(cpu) {

		cb = &per_cpu(sampler_cpu_buffer, cpu);

		atomic_set(&cb->ext_params, 0);
@@ -230,8 +228,6 @@ static int prepare_cpu_buffers(void) 
		cb->oom = 0;

		cb->stop_mode = 0;

	}



	return rc;

}



/*
@@ -1107,9 +1103,7 @@ int hwsampler_start_all(unsigned long rate) 
	if (rc)

		goto start_all_exit;



	rc = prepare_cpu_buffers();

	if (rc)

		goto start_all_exit;

	prepare_cpu_buffers();



	for_each_online_cpu(cpu) {

		rc = start_sampling(cpu);
@@ -1156,7 +1150,7 @@ int hwsampler_stop_all(void) 
	rc = 0;

	if (hws_state == HWS_INIT) {

		mutex_unlock(&hws_sem);

		return rc;

		return 0;

	}

	hws_state = HWS_STOPPING;

	mutex_unlock(&hws_sem);