Changeset 679 for GPL/trunk/alsa-kernel/pci/ak4531_codec.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/ak4531_codec.c (modified) (8 diffs)

GPL/trunk/alsa-kernel/pci/ak4531_codec.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Universal routines for AK4531 codec
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
  */
 
@@ -24 +9 @@
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#include <linux/module.h>
 
 #include <sound/core.h>
@@ -35 +21 @@
 */
 
-#ifdef CONFIG_PROC_FS
 static void snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531);
-#else
-#define snd_ak4531_proc_init(card,ak)
-#endif
 
 /*
@@ -274 +256 @@
 static const DECLARE_TLV_DB_SCALE(db_scale_input, -5000, 200, 0);
 
-static struct snd_kcontrol_new snd_ak4531_controls[] __devinitdata = {
+static const struct snd_kcontrol_new snd_ak4531_controls[] = {
 
 AK4531_DOUBLE_TLV("Master Playback Switch", 0,
@@ -354 +336 @@
 }
 
-static u8 snd_ak4531_initial_map[0x19 + 1] = {
+static const u8 snd_ak4531_initial_map[0x19 + 1] = {
         0x9f,           /* 00: Master Volume Lch */
         0x9f,           /* 01: Master Volume Rch */
@@ -383 +365 @@
 };
 
-int __devinit snd_ak4531_mixer(struct snd_card *card,
-                               struct snd_ak4531 *_ak4531,
-                               struct snd_ak4531 **rak4531)
+int snd_ak4531_mixer(struct snd_card *card,
+                     struct snd_ak4531 *_ak4531,
+                     struct snd_ak4531 **rak4531)
 {
         unsigned int idx;
         int err;
         struct snd_ak4531 *ak4531;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_ak4531_dev_free,
         };
@@ -466 +448 @@
 #endif
 
-#ifdef CONFIG_PROC_FS
 /*
  * /proc interface
@@ -483 +464 @@
 }
 
-static void __devinit
+static void
 snd_ak4531_proc_init(struct snd_card *card, struct snd_ak4531 *ak4531)
 {
-        struct snd_info_entry *entry;
-
-        if (! snd_card_proc_new(card, "ak4531", &entry))
-                snd_info_set_text_ops(entry, ak4531, snd_ak4531_proc_read);
-}
-#endif
+        snd_card_ro_proc_new(card, "ak4531", ak4531, snd_ak4531_proc_read);
+}