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

Commit c2c1b415 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by Mauro Carvalho Chehab
Browse files

[media] drivers/media: Remove unnecessary semicolon 

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

)
// <smpl>
@r1@
statement S;
position p,p1;
@@
S@p1;@p
@script:python r2@
p << r1.p;
p1 << r1.p1;
@@
if p[0].line != p1[0].line_end:
        cocci.include_match(False)
@@
position r1.p;
@@
-;@p
// </smpl>

[mchehab@redhat.com: some hunks got bitroted; applied only the
 ones that succeeds]
Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
[crope@iki.fi: For my drivers a8293, af9013, af9015, af9035]
Acked-by: default avatarAntti Palosaari <crope@iki.fi>
Reviewed-by: default avatarAntti Palosaari <crope@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 54fd321e

drivers/media/dvb-core/dvb_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -2309,7 +2309,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file, 
		fepriv->tune_mode_flags = (unsigned long) parg;

		err = 0;

		break;

	};

	}



	return err;

}

drivers/media/dvb-frontends/a8293.c

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static int a8293_set_voltage(struct dvb_frontend *fe, 
	default:

		ret = -EINVAL;

		goto err;

	};

	}



	ret = a8293_wr(priv, &priv->reg[0], 1);

	if (ret)

drivers/media/dvb-frontends/af9013.c

+3 −3
Original line number Diff line number Diff line
@@ -241,7 +241,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval) 
				KBUILD_MODNAME, gpio);

		ret = -EINVAL;

		goto err;

	};

	}



	switch (gpio) {

	case 0:
@@ -253,7 +253,7 @@ static int af9013_set_gpio(struct af9013_state *state, u8 gpio, u8 gpioval) 
	default:

		pos = 4;

		break;

	};

	}



	ret = af9013_wr_reg_bits(state, addr, pos, 4, gpioval);

	if (ret)
@@ -726,7 +726,7 @@ static int af9013_set_frontend(struct dvb_frontend *fe) 
	default:

		dev_dbg(&state->i2c->dev, "%s: invalid hierarchy\n", __func__);

		auto_mode = 1;

	};

	}



	switch (c->modulation) {

	case QAM_AUTO:

drivers/media/dvb-frontends/bcm3510.c

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ static int bcm3510_set_frontend(struct dvb_frontend *fe) 
			cmd.ACQUIRE1.IF_FREQ = 0x0;

		default:

			return -EINVAL;

	};

	}

	cmd.ACQUIRE0.OFFSET = 0;

	cmd.ACQUIRE0.NTSCSWEEP = 1;

	cmd.ACQUIRE0.FA = 1;

drivers/media/dvb-frontends/cx24110.c

+3 −3
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec) 
	   } else

		   return -EOPNOTSUPP;

/* fixme (low): which is the correct return code? */

	};

	}

	return 0;

}
@@ -275,7 +275,7 @@ static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate) 
		cx24110_writereg(state,0x07,tmp|0x3);

		cx24110_writereg(state,0x06,0x78);

		fclk=90999000UL;

	};

	}

	dprintk("cx24110 debug: fclk %d Hz\n",fclk);

	/* we need to divide two integers with approx. 27 bits in 32 bit

	   arithmetic giving a 25 bit result */
@@ -362,7 +362,7 @@ static int cx24110_initfe(struct dvb_frontend* fe) 


	for(i = 0; i < ARRAY_SIZE(cx24110_regdata); i++) {

		cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data);

	};

	}



	return 0;

}