Commit 6a168c6c authored by Daniel W. S. Almeida's avatar Daniel W. S. Almeida Committed by Mauro Carvalho Chehab
Browse files

media: dvb_dummy_fe: Fix ERROR: POINTER_LOCATION, AVOID_EXTERN and long lines 



Change foo* bar to foo *bar to avoid ERROR: POINTER_LOCATION in checkpatch

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_read_snr(struct dvb_frontend* fe, u16* snr)

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_read_snr(struct dvb_frontend* fe, u16* snr)

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks)

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_sleep(struct dvb_frontend* fe)

ERROR: "foo* bar" should be "foo *bar"
+static int dvb_dummy_fe_init(struct dvb_frontend* fe)

ERROR: "foo* bar" should be "foo *bar"
+static void dvb_dummy_fe_release(struct dvb_frontend* fe)

ERROR: "foo* bar" should be "foo *bar"
+	struct dvb_dummy_fe_state* state = fe->demodulator_priv;

ERROR: "foo* bar" should be "foo *bar"
+struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void)

ERROR: "foo* bar" should be "foo *bar"
+	struct dvb_dummy_fe_state* state = NULL;

ERROR: "foo* bar" should be "foo *bar"
+	struct dvb_dummy_fe_state* state = NULL;

ERROR: "foo* bar" should be "foo *bar"
+	struct dvb_dummy_fe_state* state = NULL;

remove 'extern' keyword from declaration

Fix CHECK:AVOID_EXTERNS: extern prototypes should be avoided in .h files
by removing it.

Fix long lines

Break long lines into smaller ones to improve readability.

WARNING: line over 80 characters
+	memcpy(&state->frontend.ops, &dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));

WARNING: line over 80 characters
+	memcpy(&state->frontend.ops, &dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));
WARNING: line over 80 characters
+	memcpy(&state->frontend.ops, &dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));

WARNING: line over 80 characters
+				FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |

WARNING: line over 80 characters
+				FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |

WARNING: line over 80 characters
+				FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |

WARNING: line over 80 characters
+		.symbol_rate_min	= (57840000 / 2) / 6

Suggested-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarDaniel W. S. Almeida <dwlsalmeida@gmail.com>
Signed-off-by: default avatarSean Young <sean@mess.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 9fcfae8a

drivers/media/dvb-frontends/dvb_dummy_fe.c

+54 −28
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ static int dvb_dummy_fe_read_ber(struct dvb_frontend* fe, u32* ber) 
	return 0;

}



static int dvb_dummy_fe_read_signal_strength(struct dvb_frontend* fe, u16* strength)

static int dvb_dummy_fe_read_signal_strength(struct dvb_frontend *fe,

					     u16 *strength)

{

	*strength = 0;

	return 0;
@@ -102,7 +103,6 @@ static int dvb_dummy_fe_set_voltage(struct dvb_frontend *fe, 
static void dvb_dummy_fe_release(struct dvb_frontend *fe)

{

	struct dvb_dummy_fe_state *state = fe->demodulator_priv;



	kfree(state);

}
@@ -118,7 +118,10 @@ struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void) 
		return NULL;



	/* create dvb_frontend */

	memcpy(&state->frontend.ops, &dvb_dummy_fe_ofdm_ops, sizeof(struct dvb_frontend_ops));

	memcpy(&state->frontend.ops,

	       &dvb_dummy_fe_ofdm_ops,

	       sizeof(struct dvb_frontend_ops));



	state->frontend.demodulator_priv = state;

	return &state->frontend;

}
@@ -136,7 +139,10 @@ struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void) 
		return NULL;



	/* create dvb_frontend */

	memcpy(&state->frontend.ops, &dvb_dummy_fe_qpsk_ops, sizeof(struct dvb_frontend_ops));

	memcpy(&state->frontend.ops,

	       &dvb_dummy_fe_qpsk_ops,

	       sizeof(struct dvb_frontend_ops));



	state->frontend.demodulator_priv = state;

	return &state->frontend;

}
@@ -154,7 +160,10 @@ struct dvb_frontend *dvb_dummy_fe_qam_attach(void) 
		return NULL;



	/* create dvb_frontend */

	memcpy(&state->frontend.ops, &dvb_dummy_fe_qam_ops, sizeof(struct dvb_frontend_ops));

	memcpy(&state->frontend.ops,

	       &dvb_dummy_fe_qam_ops,

	       sizeof(struct dvb_frontend_ops));



	state->frontend.demodulator_priv = state;

	return &state->frontend;

}
@@ -167,10 +176,18 @@ static const struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = { 
		.frequency_min_hz	= 0,

		.frequency_max_hz	= 863250 * kHz,

		.frequency_stepsize_hz	= 62500,

		.caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |

				FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |

				FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO |

				FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO |

		.caps = FE_CAN_FEC_1_2 |

			FE_CAN_FEC_2_3 |

			FE_CAN_FEC_3_4 |

			FE_CAN_FEC_4_5 |

			FE_CAN_FEC_5_6 |

			FE_CAN_FEC_6_7 |

			FE_CAN_FEC_7_8 |

			FE_CAN_FEC_8_9 |

			FE_CAN_FEC_AUTO |

			FE_CAN_QAM_16 |

			FE_CAN_QAM_64 |

			FE_CAN_QAM_AUTO |

			FE_CAN_TRANSMISSION_MODE_AUTO |

			FE_CAN_GUARD_INTERVAL_AUTO |

			FE_CAN_HIERARCHY_AUTO,
@@ -198,11 +215,16 @@ static const struct dvb_frontend_ops dvb_dummy_fe_qam_ops = { 
		.frequency_min_hz	=  51 * MHz,

		.frequency_max_hz	= 858 * MHz,

		.frequency_stepsize_hz	= 62500,

		.symbol_rate_min	= (57840000 / 2) / 64,  /* SACLK/64 == (XIN/2)/64 */

		/* symbol_rate_min: SACLK/64 == (XIN/2)/64 */

		.symbol_rate_min	= (57840000 / 2) / 64,

		.symbol_rate_max	= (57840000 / 2) / 4,   /* SACLK/4 */

		.caps = FE_CAN_QAM_16 | FE_CAN_QAM_32 | FE_CAN_QAM_64 |

			FE_CAN_QAM_128 | FE_CAN_QAM_256 |

			FE_CAN_FEC_AUTO | FE_CAN_INVERSION_AUTO

		.caps = FE_CAN_QAM_16 |

			FE_CAN_QAM_32 |

			FE_CAN_QAM_64 |

			FE_CAN_QAM_128 |

			FE_CAN_QAM_256 |

			FE_CAN_FEC_AUTO |

			FE_CAN_INVERSION_AUTO

	},



	.release = dvb_dummy_fe_release,
@@ -231,8 +253,12 @@ static const struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops = { 
		.symbol_rate_min	= 1000000,

		.symbol_rate_max	= 45000000,

		.caps = FE_CAN_INVERSION_AUTO |

			FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 |

			FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |

			FE_CAN_FEC_1_2 |

			FE_CAN_FEC_2_3 |

			FE_CAN_FEC_3_4 |

			FE_CAN_FEC_5_6 |

			FE_CAN_FEC_7_8 |

			FE_CAN_FEC_AUTO |

			FE_CAN_QPSK

	},

drivers/media/dvb-frontends/dvb_dummy_fe.h

+3 −3
Original line number Diff line number Diff line
@@ -12,9 +12,9 @@ 
#include <media/dvb_frontend.h>



#if IS_REACHABLE(CONFIG_DVB_DUMMY_FE)

extern struct dvb_frontend* dvb_dummy_fe_ofdm_attach(void);

extern struct dvb_frontend* dvb_dummy_fe_qpsk_attach(void);

extern struct dvb_frontend* dvb_dummy_fe_qam_attach(void);

struct dvb_frontend *dvb_dummy_fe_ofdm_attach(void);

struct dvb_frontend *dvb_dummy_fe_qpsk_attach(void);

struct dvb_frontend *dvb_dummy_fe_qam_attach(void);

#else

static inline struct dvb_frontend *dvb_dummy_fe_ofdm_attach(void)

{