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

Timestamp:

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

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/emu10k1/io.c (modified) (11 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/io.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -9 +10 @@
  *  TODO:
  *    --
- *
- *   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
- *
  */
 
@@ -30 +16 @@
 #include <sound/emu10k1.h>
 #include <linux/delay.h>
+#include <linux/export.h>
 #include "p17v.h"
 
@@ -71 +58 @@
         unsigned int mask;
 
-        if (!emu) {
-                snd_printk(KERN_ERR "ptr_write: emu is null!\n");
-                dump_stack();
+        if (snd_BUG_ON(!emu))
                 return;
-        }
         mask = emu->audigy ? A_PTR_ADDRESS_MASK : PTR_ADDRESS_MASK;
         regptr = ((reg << 16) & mask) | (chn & PTR_CHANNELNUM_MASK);
@@ -102 +86 @@
 EXPORT_SYMBOL(snd_emu10k1_ptr_write);
 
-unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu,
-                                          unsigned int reg,
+unsigned int snd_emu10k1_ptr20_read(struct snd_emu10k1 * emu, 
+                                          unsigned int reg, 
                                           unsigned int chn)
 {
         unsigned long flags;
         unsigned int regptr, val;
-
+  
         regptr = (reg << 16) | chn;
 
@@ -118 +102 @@
 }
 
-void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu,
-                                   unsigned int reg,
-                                   unsigned int chn,
+void snd_emu10k1_ptr20_write(struct snd_emu10k1 *emu, 
+                                   unsigned int reg, 
+                                   unsigned int chn, 
                                    unsigned int data)
 {
@@ -199 +183 @@
 
         if ((reg > 0x7f) || (value > 0x1ff)) {
-                snd_printk(KERN_ERR "i2c_write: invalid values.\n");
+                dev_err(emu->card->dev, "i2c_write: invalid values.\n");
                 return -EINVAL;
         }
@@ -227 +211 @@
 
                         if (timeout > 1000) {
-                                snd_printk(KERN_WARNING
+                                dev_warn(emu->card->dev,
                                            "emu10k1:I2C:timeout status=0x%x\n",
                                            status);
@@ -239 +223 @@
 
         if (retry == 10) {
-                snd_printk(KERN_ERR "Writing to ADC failed!\n");
-                snd_printk(KERN_ERR "status=0x%x, reg=%d, value=%d\n",
+                dev_err(emu->card->dev, "Writing to ADC failed!\n");
+                dev_err(emu->card->dev, "status=0x%x, reg=%d, value=%d\n",
                         status, reg, value);
                 /* dump_stack(); */
                 err = -EINVAL;
         }
-
+    
         spin_unlock(&emu->i2c_lock);
         return err;
@@ -527 +511 @@
 unsigned int snd_emu10k1_rate_to_pitch(unsigned int rate)
 {
-        static u32 logMagTable[128] = {
+        static const u32 logMagTable[128] = {
                 0x00000, 0x02dfc, 0x05b9e, 0x088e6, 0x0b5d6, 0x0e26f, 0x10eb3, 0x13aa2,
                 0x1663f, 0x1918a, 0x1bc84, 0x1e72e, 0x2118b, 0x23b9a, 0x2655d, 0x28ed5,
@@ -545 +529 @@
                 0xf4463, 0xf5c2a, 0xf73da, 0xf8b71, 0xfa2f0, 0xfba57, 0xfd1a7, 0xfe8df
         };
-        static char logSlopeTable[128] = {
+        static const char logSlopeTable[128] = {
                 0x5c, 0x5c, 0x5b, 0x5a, 0x5a, 0x59, 0x58, 0x58,
                 0x57, 0x56, 0x56, 0x55, 0x55, 0x54, 0x53, 0x53,