[media] dib0070: Fix indenting (f3f8ef22) · Commits · 戴 / test

The indentation on this driver were deadly broken. On lots of places, it was using 4 spaces instead of tab to indent. On other parts, it were using tabs. Also, on several places, it were not even being properly aligned, as reported by smatch: drivers/media/dvb-frontends/dib0070.c:179 dib0070_set_bandwidth() warn: inconsistent indenting drivers/media/dvb-frontends/dib0070.c:198 dib0070_captrim() warn: inconsistent indenting drivers/media/dvb-frontends/dib0070.c:246 dib0070_set_ctrl_lo5() warn: inconsistent indenting drivers/media/dvb-frontends/dib0070.c:260 dib0070_ctrl_agc_filter() warn: inconsistent indenting drivers/media/dvb-frontends/dib0070.c:494 dib0070_tune_digital() warn: inconsistent indenting drivers/media/dvb-frontends/dib0070.c:498 dib0070_tune_digital() warn: inconsistent indenting drivers/media/dvb-frontends/dib0070.c:655 dib0070_reset() warn: inconsistent indenting drivers/media/dvb-frontends/dib0070.c:711 dib0070_reset() warn: curly braces intended? drivers/media/dvb-frontends/dib0070.c:713 dib0070_reset() warn: inconsistent indenting My first idea were to leave it as-is or to just touch the above. However, this won't be fixing anything. So, as painful as it is, let's fix indentation globally on the driver, and then address the inconsistencies. Hopefully, this driver doesn't have much patches, so it likely won't conflict to any other patch during this merge window. Besides the big size of this patch, no functional changes were done. Signed-off-by:

Mauro Carvalho Chehab <mchehab@osg.samsung.com>

drivers/media/dvb-frontends/dib0070.c

+287 −288

Original line number	Diff line number	Diff line
		@@ -186,7 +186,6 @@ static int dib0070_captrim(struct dib0070_state *state, enum frontend_tune_state
		int ret = 0;

		if (*tune_state == CT_TUNER_STEP_0) {

		dib0070_write_reg(state, 0x0f, 0xed10);
		dib0070_write_reg(state, 0x17, 0x0034);

		@@ -220,9 +219,6 @@ static int dib0070_captrim(struct dib0070_state *state, enum frontend_tune_state
		dprintk("CAPTRIM=%hd is closer to target (%hd/%hd)", state->captrim, adc, state->adc_diff);
		state->adc_diff = adc;
		state->fcaptrim = state->captrim;



		}
		state->captrim += (step_sign * state->step);

		@@ -244,6 +240,7 @@ static int dib0070_set_ctrl_lo5(struct dvb_frontend *fe, u8 vco_bias_trim, u8 hf
		{
		struct dib0070_state *state = fe->tuner_priv;
		u16 lo5 = (third_order_filt << 14) \| (0 << 13) \| (1 << 12) \| (3 << 9) \| (cp_current << 6) \| (hf_div_trim << 3) \| (vco_bias_trim << 0);

		dprintk("CTRL_LO5: 0x%x", lo5);
		return dib0070_write_reg(state, 0x15, lo5);
		}
		@@ -489,8 +486,9 @@ static int dib0070_tune_digital(struct dvb_frontend *fe)
		state->wbd_gain_current = tmp->wbd_gain_val;
		} else {
		dib0070_write_reg(state, 0x0f,
		(0 << 15) \| (1 << 14) \| (3 << 12) \| (6 << 9) \| (0 << 8) \| (1 << 7) \| (state->current_tune_table_index->
		wbdmux << 0));
		(0 << 15) \| (1 << 14) \| (3 << 12)
		\| (6 << 9) \| (0 << 8) \| (1 << 7)
		\| (state->current_tune_table_index->wbdmux << 0));
		state->wbd_gain_current = 6;
		}

		@@ -706,7 +704,8 @@ static int dib0070_reset(struct dvb_frontend *fe)
		if (state->revision == DIB0070S_P1A)
		dib0070_set_ctrl_lo5(fe, 2, 4, 3, 0);
		else
		dib0070_set_ctrl_lo5(fe, 5, 4, state->cfg->charge_pump, state->cfg->enable_third_order_filter);
		dib0070_set_ctrl_lo5(fe, 5, 4, state->cfg->charge_pump,
		state->cfg->enable_third_order_filter);

		dib0070_write_reg(state, 0x01, (54 << 9) \| 0xc8);

Admin message