forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 
 kernel/sound/isa/msnd/msnd_pinnacle_mixer.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /***************************************************************************
23 			  msnd_pinnacle_mixer.c  -  description
34 			     -------------------
....@@ -8,10 +9,6 @@
89 
910 /***************************************************************************
1011  *							      		   *
11
- *   This program is free software; you can redistribute it and/or modify  *
12
- *   it under the terms of the GNU General Public License as published by  *
13
- *   the Free Software Foundation; either version 2 of the License, or     *
14
- *   (at your option) any later version.				   *
1512  *									   *
1613  ***************************************************************************/
1714 
....@@ -222,11 +219,9 @@
222219 	case MSND_MIXER_VOLUME:		/* master volume */
223220 		writew(wLeft, dev->SMA + SMA_wCurrMastVolLeft);
224221 		writew(wRight, dev->SMA + SMA_wCurrMastVolRight);
225
-		/* fall through */
226
-
222
+		fallthrough;
227223 	case MSND_MIXER_AUX:			/* aux pot control */
228224 		/* scaled by master volume */
229
-		/* fall through */
230225 
231226 		/* digital controls */
232227 	case MSND_MIXER_SYNTH:			/* synth vol (dsp mix) */
....@@ -278,7 +273,7 @@
278273   .private_value = addr }
279274 
280275 
281
-static struct snd_kcontrol_new snd_msnd_controls[] = {
276
+static const struct snd_kcontrol_new snd_msnd_controls[] = {
282277 DUMMY_VOLUME("Master Volume", 0, MSND_MIXER_VOLUME),
283278 DUMMY_VOLUME("PCM Volume", 0, MSND_MIXER_PCM),
284279 DUMMY_VOLUME("Aux Volume", 0, MSND_MIXER_AUX),