移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/sound/soc/codecs/da732x.c
..
..
@@ -1,13 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * da732x.c --- Dialog DA732X ALSA SoC Audio Driver
3
4
  *
4
5
  * Copyright (C) 2012 Dialog Semiconductor GmbH
5
6
  *
6
7
  * Author: Michal Hajduk <Michal.Hajduk@diasemi.com>
7
- *
8
- * This program is free software; you can redistribute it and/or modify
9
- * it under the terms of the GNU General Public License version 2 as
10
- * published by the Free Software Foundation.
11
8
  */
12
9
 
13
10
 #include <linux/module.h>
..
..
@@ -364,7 +361,7 @@
364
361
 	unsigned int reg = enum_ctrl->reg;
365
362
 	int val;
366
363
 
367
-	val = snd_soc_component_read32(component, reg) & DA732X_HPF_MASK;
364
+	val = snd_soc_component_read(component, reg) & DA732X_HPF_MASK;
368
365
 
369
366
 	switch (val) {
370
367
 	case DA732X_HPF_VOICE_EN:
..
..
@@ -1290,9 +1287,9 @@
1290
1287
 	msleep(DA732X_WAIT_FOR_STABILIZATION);
1291
1288
 
1292
1289
 	/* Check DAC offset sign */
1293
-	sign[DA732X_HPL_DAC] = (snd_soc_component_read32(component, DA732X_REG_HPL_DAC_OFF_CNTL) &
1290
+	sign[DA732X_HPL_DAC] = (snd_soc_component_read(component, DA732X_REG_HPL_DAC_OFF_CNTL) &
1294
1291
 				DA732X_HP_DAC_OFF_CNTL_COMPO);
1295
-	sign[DA732X_HPR_DAC] = (snd_soc_component_read32(component, DA732X_REG_HPR_DAC_OFF_CNTL) &
1292
+	sign[DA732X_HPR_DAC] = (snd_soc_component_read(component, DA732X_REG_HPR_DAC_OFF_CNTL) &
1296
1293
 				DA732X_HP_DAC_OFF_CNTL_COMPO);
1297
1294
 
1298
1295
 	/* Binary search DAC offset values (both channels at once) */
..
..
@@ -1309,10 +1306,10 @@
1309
1306
 
1310
1307
 		msleep(DA732X_WAIT_FOR_STABILIZATION);
1311
1308
 
1312
-		if ((snd_soc_component_read32(component, DA732X_REG_HPL_DAC_OFF_CNTL) &
1309
+		if ((snd_soc_component_read(component, DA732X_REG_HPL_DAC_OFF_CNTL) &
1313
1310
 		     DA732X_HP_DAC_OFF_CNTL_COMPO) ^ sign[DA732X_HPL_DAC])
1314
1311
 			offset[DA732X_HPL_DAC] &= ~step;
1315
-		if ((snd_soc_component_read32(component, DA732X_REG_HPR_DAC_OFF_CNTL) &
1312
+		if ((snd_soc_component_read(component, DA732X_REG_HPR_DAC_OFF_CNTL) &
1316
1313
 		     DA732X_HP_DAC_OFF_CNTL_COMPO) ^ sign[DA732X_HPR_DAC])
1317
1314
 			offset[DA732X_HPR_DAC] &= ~step;
1318
1315
 
..
..
@@ -1353,9 +1350,9 @@
1353
1350
 	msleep(DA732X_WAIT_FOR_STABILIZATION);
1354
1351
 
1355
1352
 	/* Check output offset sign */
1356
-	sign[DA732X_HPL_AMP] = snd_soc_component_read32(component, DA732X_REG_HPL) &
1353
+	sign[DA732X_HPL_AMP] = snd_soc_component_read(component, DA732X_REG_HPL) &
1357
1354
 			       DA732X_HP_OUT_COMPO;
1358
-	sign[DA732X_HPR_AMP] = snd_soc_component_read32(component, DA732X_REG_HPR) &
1355
+	sign[DA732X_HPR_AMP] = snd_soc_component_read(component, DA732X_REG_HPR) &
1359
1356
 			       DA732X_HP_OUT_COMPO;
1360
1357
 
1361
1358
 	snd_soc_component_write(component, DA732X_REG_HPL, DA732X_HP_OUT_COMP |
..
..
@@ -1376,10 +1373,10 @@
1376
1373
 
1377
1374
 		msleep(DA732X_WAIT_FOR_STABILIZATION);
1378
1375
 
1379
-		if ((snd_soc_component_read32(component, DA732X_REG_HPL) &
1376
+		if ((snd_soc_component_read(component, DA732X_REG_HPL) &
1380
1377
 		     DA732X_HP_OUT_COMPO) ^ sign[DA732X_HPL_AMP])
1381
1378
 			offset[DA732X_HPL_AMP] &= ~step;
1382
-		if ((snd_soc_component_read32(component, DA732X_REG_HPR) &
1379
+		if ((snd_soc_component_read(component, DA732X_REG_HPR) &
1383
1380
 		     DA732X_HP_OUT_COMPO) ^ sign[DA732X_HPR_AMP])
1384
1381
 			offset[DA732X_HPR_AMP] &= ~step;
1385
1382