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

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

[S390] s390: Remove redundant test

The loop above the modified code only terminates when rc is a valid pointer.

A simplified version of the semantic patch that makes this change is as
follows: (http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@r exists@
local idexpression x;
expression E;
position p1,p2;
@@

if (x@p1 == NULL || ...) { ... when forall
   return ...; }
... when != \(x=E\|x--\|x++\|--x\|++x\|x-=E\|x+=E\|x|=E\|x&=E\|&x\)
(
x@p2 == NULL
|
x@p2 != NULL
)

// another path to the test that is not through p1?
@s exists@
local idexpression r.x;
position r.p1,r.p2;
@@

... when != x@p1
(
x@p2 == NULL
|
x@p2 != NULL
)

@Fix depends on !s@
position r.p1,r.p2;
expression x,E;
statement S1,S2;
@@

(
- if ((x@p2 != NULL) || ...)
  S1
|
- if ((x@p2 == NULL) && ...) S1
|
- BUG_ON(x@p2 == NULL);
)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 0946100f
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -388,7 +388,7 @@ debug_info_copy(debug_info_t* in, int mode)
		debug_info_free(rc);
		debug_info_free(rc);
	} while (1);
	} while (1);


        if(!rc || (mode == NO_AREAS))
	if (mode == NO_AREAS)
                goto out;
                goto out;


        for(i = 0; i < in->nr_areas; i++){
        for(i = 0; i < in->nr_areas; i++){
+0 −1
Original line number Original line Diff line number Diff line
@@ -2335,7 +2335,6 @@ static int qeth_init_input_buffer(struct qeth_card *card,
	 * the QETH_IN_BUF_REQUEUE_THRESHOLD we should never run  out off
	 * the QETH_IN_BUF_REQUEUE_THRESHOLD we should never run  out off
	 * buffers
	 * buffers
	 */
	 */
	BUG_ON(!pool_entry);


	buf->pool_entry = pool_entry;
	buf->pool_entry = pool_entry;
	for (i = 0; i < QETH_MAX_BUFFER_ELEMENTS(card); ++i) {
	for (i = 0; i < QETH_MAX_BUFFER_ELEMENTS(card); ++i) {