Changeset 679 for GPL/trunk/alsa-kernel/include/sound/ak4114.h

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/include/sound/ak4114.h (modified) (6 diffs)

GPL/trunk/alsa-kernel/include/sound/ak4114.h

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SOUND_AK4114_H
 #define __SOUND_AK4114_H
@@ -5 +6 @@
  *  Routines for Asahi Kasei AK4114
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>,
- *
- *
- *   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
- *
  */
 
@@ -164 +149 @@
 typedef unsigned char (ak4114_read_t)(void *private_data, unsigned char addr);
 
+enum {
+        AK4114_PARITY_ERRORS,
+        AK4114_V_BIT_ERRORS,
+        AK4114_QCRC_ERRORS,
+        AK4114_CCRC_ERRORS,
+        AK4114_NUM_ERRORS
+};
+
 struct ak4114 {
         struct snd_card *card;
@@ -169 +162 @@
         ak4114_read_t * read;
         void * private_data;
-        unsigned int init: 1;
+        atomic_t wq_processing;
+        struct mutex reinit_mutex;
         spinlock_t lock;
-        unsigned char regmap[7];
+        unsigned char regmap[6];
         unsigned char txcsb[5];
         struct snd_kcontrol *kctls[AK4114_CONTROLS];
         struct snd_pcm_substream *playback_substream;
         struct snd_pcm_substream *capture_substream;
-        unsigned long parity_errors;
-        unsigned long v_bit_errors;
-        unsigned long qcrc_errors;
-        unsigned long ccrc_errors;
+        unsigned long errors[AK4114_NUM_ERRORS];
         unsigned char rcs0;
         unsigned char rcs1;
@@ -190 +181 @@
 int snd_ak4114_create(struct snd_card *card,
                       ak4114_read_t *read, ak4114_write_t *write,
-                      const unsigned char pgm[7], const unsigned char txcsb[5],
+                      const unsigned char pgm[6], const unsigned char txcsb[5],
                       void *private_data, struct ak4114 **r_ak4114);
 void snd_ak4114_reg_write(struct ak4114 *ak4114, unsigned char reg, unsigned char mask, unsigned char val);
@@ -200 +191 @@
 int snd_ak4114_check_rate_and_errors(struct ak4114 *ak4114, unsigned int flags);
 
+#ifdef CONFIG_PM
+void snd_ak4114_suspend(struct ak4114 *chip);
+void snd_ak4114_resume(struct ak4114 *chip);
+#else
+static inline void snd_ak4114_suspend(struct ak4114 *chip) {}
+static inline void snd_ak4114_resume(struct ak4114 *chip) {}
+#endif
+
 #endif /* __SOUND_AK4114_H */