forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf 
 kernel/drivers/media/dvb-frontends/dib8000.c
....@@ -1,11 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
12 /*
23  * Linux-DVB Driver for DiBcom's DiB8000 chip (ISDB-T).
34  *
45  * Copyright (C) 2009 DiBcom (http://www.dibcom.fr/)
5
- *
6
- * This program is free software; you can redistribute it and/or
7
- *  modify it under the terms of the GNU General Public License as
8
- *  published by the Free Software Foundation, version 2.
96  */
107 
118 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
....@@ -564,7 +561,7 @@
564561 			dib8000_write_word(state, 1925, reg |
565562 					(1<<4) | (1<<2));
566563 
567
-			/* read acces to make it works... strange ... */
564
+			/* read access to make it works... strange ... */
568565 			reg = dib8000_read_word(state, 1925);
569566 			msleep(20);
570567 			/* en_slowAdc = 1 & reset_sladc = 0 */
....@@ -1091,7 +1088,7 @@
10911088 
10921089 	if ((state->revision != 0x8090) &&
10931090 			(dib8000_set_output_mode(fe, OUTMODE_HIGH_Z) != 0))
1094
-		dprintk("OUTPUT_MODE could not be resetted.\n");
1091
+		dprintk("OUTPUT_MODE could not be reset.\n");
10951092 
10961093 	state->current_agc = NULL;
10971094 
....@@ -1867,7 +1864,7 @@
18671864 			}
18681865 	}
18691866 
1870
-	if (apb_address != 0) /* R/W acces via APB */
1867
+	if (apb_address != 0) /* R/W access via APB */
18711868 		return dib8096p_rw_on_apb(i2c_adap, msg, num, apb_address);
18721869 	else  /* R/W access via SERPAR  */
18731870 		return dib8096p_tuner_rw_serpar(i2c_adap, msg, num);
....@@ -3104,7 +3101,7 @@
31043101 			state->autosearch_state = AS_DONE;
31053102 			*tune_state = CT_DEMOD_STOP; /* else we are done here */
31063103 			break;
3107
-		case 2: /* Succes */
3104
+		case 2: /* Success */
31083105 			state->status = FE_STATUS_FFT_SUCCESS; /* signal to the upper layer, that there was a channel found and the parameters can be read */
31093106 			*tune_state = CT_DEMOD_STEP_3;
31103107 			if (state->autosearch_state == AS_SEARCHING_GUARD)
....@@ -3215,10 +3212,10 @@
32153212 
32163213 	case CT_DEMOD_STEP_6: /* (36)  if there is an input (diversity) */
32173214 		if ((state->fe[1] != NULL) && (state->output_mode != OUTMODE_DIVERSITY)) {
3218
-			/* if there is a diversity fe in input and this fe is has not already failled : wait here until this this fe has succedeed or failled */
3215
+			/* if there is a diversity fe in input and this fe is has not already failed : wait here until this this fe has succedeed or failed */
32193216 			if (dib8000_get_status(state->fe[1]) <= FE_STATUS_STD_SUCCESS) /* Something is locked on the input fe */
32203217 				*tune_state = CT_DEMOD_STEP_8; /* go for mpeg */
3221
-			else if (dib8000_get_status(state->fe[1]) >= FE_STATUS_TUNE_TIME_TOO_SHORT) { /* fe in input failled also, break the current one */
3218
+			else if (dib8000_get_status(state->fe[1]) >= FE_STATUS_TUNE_TIME_TOO_SHORT) { /* fe in input failed also, break the current one */
32223219 				*tune_state = CT_DEMOD_STOP; /* else we are done here ; step 8 will close the loops and exit */
32233220 				dib8000_viterbi_state(state, 1); /* start viterbi chandec */
32243221 				dib8000_set_isdbt_loop_params(state, LOOP_TUNE_2);
....@@ -4484,8 +4481,8 @@
44844481 	dibx000_init_i2c_master(&state->i2c_master, DIB8000, state->i2c.adap, state->i2c.addr);
44854482 
44864483 	/* init 8096p tuner adapter */
4487
-	strncpy(state->dib8096p_tuner_adap.name, "DiB8096P tuner interface",
4488
-			sizeof(state->dib8096p_tuner_adap.name));
4484
+	strscpy(state->dib8096p_tuner_adap.name, "DiB8096P tuner interface",
4485
+		sizeof(state->dib8096p_tuner_adap.name));
44894486 	state->dib8096p_tuner_adap.algo = &dib8096p_tuner_xfer_algo;
44904487 	state->dib8096p_tuner_adap.algo_data = NULL;
44914488 	state->dib8096p_tuner_adap.dev.parent = state->i2c.adap->dev.parent;
....@@ -4530,7 +4527,7 @@
45304527 
45314528 	return ops;
45324529 }
4533
-EXPORT_SYMBOL(dib8000_attach);
4530
+EXPORT_SYMBOL_GPL(dib8000_attach);
45344531 
45354532 MODULE_AUTHOR("Olivier Grenie <Olivier.Grenie@parrot.com, Patrick Boettcher <patrick.boettcher@posteo.de>");
45364533 MODULE_DESCRIPTION("Driver for the DiBcom 8000 ISDB-T demodulator");