Changeset 679 for GPL/trunk/alsa-kernel/pci/cs5535audio/cs5535audio.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/cs5535audio/cs5535audio.c (modified) (25 diffs)

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Driver for audio on multifunction CS5535/6 companion device
@@ -5 +6 @@
  * Based on Jaroslav Kysela and Takashi Iwai's examples.
  * This work was sponsored by CIS(M) Sdn Bhd.
- *
- * 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
- *
  */
 
@@ -27 +13 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
-#include <linux/moduleparam.h>
-#include <asm/io.h>
+#include <linux/module.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/control.h>
@@ -39 +25 @@
 
 #define DRIVER_NAME "cs5535audio"
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME DRIVER_NAME
+#include <linux/dma-mapping.h>
+#endif
 
 static char *ac97_quirk;
@@ -44 +34 @@
 MODULE_PARM_DESC(ac97_quirk, "AC'97 board specific workarounds.");
 
-static struct ac97_quirk ac97_quirks[] __devinitdata = {
+static const struct ac97_quirk ac97_quirks[] = {
 #if 0 /* Not yet confirmed if all 5536 boards are HP only */
         {
@@ -58 +48 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
 
 module_param_array(index, int, NULL, 0444);
@@ -67 +57 @@
 MODULE_PARM_DESC(enable, "Enable " DRIVER_NAME);
 
-static DEFINE_PCI_DEVICE_TABLE(snd_cs5535audio_ids) = {
+static const struct pci_device_id snd_cs5535audio_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_CS5535_AUDIO) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_AUDIO) },
@@ -85 +75 @@
         } while (--timeout);
         if (!timeout)
-                snd_printk(KERN_ERR "Failure writing to cs5535 codec\n");
+                dev_err(cs5535au->card->dev,
+                        "Failure writing to cs5535 codec\n");
 }
 
@@ -110 +101 @@
         } while (--timeout);
         if (!timeout)
-                snd_printk(KERN_ERR "Failure reading codec reg 0x%x,"
-                                        "Last value=0x%x\n", reg, val);
+                dev_err(cs5535au->card->dev,
+                        "Failure reading codec reg 0x%x, Last value=0x%x\n",
+                        reg, val);
 
         return (unsigned short) val;
@@ -145 +137 @@
 }
 
-static int __devinit snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
+static int snd_cs5535audio_mixer(struct cs5535audio *cs5535au)
 {
         struct snd_card *card = cs5535au->card;
@@ -151 +143 @@
         struct snd_ac97_template ac97;
         int err;
-        static struct snd_ac97_bus_ops ops = {
+        static const struct snd_ac97_bus_ops ops = {
                 .write = snd_cs5535audio_ac97_codec_write,
                 .read = snd_cs5535audio_ac97_codec_read,
@@ -169 +161 @@
 
         if ((err = snd_ac97_mixer(pbus, &ac97, &cs5535au->ac97)) < 0) {
-                snd_printk(KERN_ERR "mixer failed\n");
+                dev_err(card->dev, "mixer failed\n");
                 return err;
         }
@@ -177 +169 @@
         err = olpc_quirks(card, cs5535au->ac97);
         if (err < 0) {
-                snd_printk(KERN_ERR "olpc quirks failed\n");
+                dev_err(card->dev, "olpc quirks failed\n");
                 return err;
         }
@@ -191 +183 @@
         spin_unlock(&cs5535au->reg_lock);
         if (bm_stat & EOP) {
-                struct cs5535audio_dma *dma;
-                dma = cs5535au->playback_substream->runtime->private_data;
                 snd_pcm_period_elapsed(cs5535au->playback_substream);
         } else {
-                snd_printk(KERN_ERR "unexpected bm0 irq src, bm_stat=%x\n",
-                                        bm_stat);
+                dev_err(cs5535au->card->dev,
+                        "unexpected bm0 irq src, bm_stat=%x\n",
+                        bm_stat);
         }
 }
@@ -206 +197 @@
         bm_stat = cs_readb(cs5535au, ACC_BM1_STATUS);
         spin_unlock(&cs5535au->reg_lock);
-        if (bm_stat & EOP) {
-                struct cs5535audio_dma *dma;
-                dma = cs5535au->capture_substream->runtime->private_data;
+        if (bm_stat & EOP)
                 snd_pcm_period_elapsed(cs5535au->capture_substream);
-        }
 }
 
@@ -242 +230 @@
                                 break;
                         default:
-                                snd_printk(KERN_ERR "Unexpected irq src: "
-                                                "0x%x\n", acc_irq_stat);
+                                dev_err(cs5535au->card->dev,
+                                        "Unexpected irq src: 0x%x\n",
+                                        acc_irq_stat);
                                 break;
                         }
@@ -253 +242 @@
 static int snd_cs5535audio_free(struct cs5535audio *cs5535au)
 {
-        synchronize_irq(cs5535au->irq);
-        pci_set_power_state(cs5535au->pci, 3);
+        pci_set_power_state(cs5535au->pci, PCI_D3hot);
 
         if (cs5535au->irq >= 0)
@@ -271 +259 @@
 }
 
-static int __devinit snd_cs5535audio_create(struct snd_card *card,
-                                            struct pci_dev *pci,
-                                            struct cs5535audio **rcs5535au)
+static int snd_cs5535audio_create(struct snd_card *card,
+                                  struct pci_dev *pci,
+                                  struct cs5535audio **rcs5535au)
 {
         struct cs5535audio *cs5535au;
 
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_cs5535audio_dev_free,
         };
@@ -286 +274 @@
                 return err;
 
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(32)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(32)) < 0) {
-                printk(KERN_WARNING "unable to get 32bit dma\n");
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(32)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(32)) < 0) {
+                dev_warn(card->dev, "unable to get 32bit dma\n");
                 err = -ENXIO;
                 goto pcifail;
@@ -312 +300 @@
 
         if (request_irq(pci->irq, snd_cs5535audio_interrupt,
-                        IRQF_SHARED, "CS5535 Audio", cs5535au)) {
-                snd_printk(KERN_ERR "unable to grab IRQ %d\n", pci->irq);
+                        IRQF_SHARED, KBUILD_MODNAME, cs5535au)) {
+                dev_err(card->dev, "unable to grab IRQ %d\n", pci->irq);
                 err = -EBUSY;
                 goto sndfail;
@@ -319 +307 @@
 
         cs5535au->irq = pci->irq;
+        card->sync_irq = cs5535au->irq;
         pci_set_master(pci);
 
@@ -325 +314 @@
                 goto sndfail;
 
-        snd_card_set_dev(card, &pci->dev);
-
         *rcs5535au = cs5535au;
         return 0;
@@ -339 +326 @@
 }
 
-static int __devinit snd_cs5535audio_probe(struct pci_dev *pci,
-                                           const struct pci_device_id *pci_id)
+static int snd_cs5535audio_probe(struct pci_dev *pci,
+                                 const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -354 +341 @@
         }
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                           0, &card);
         if (err < 0)
                 return err;
@@ -388 +376 @@
 }
 
-static void __devexit snd_cs5535audio_remove(struct pci_dev *pci)
+static void snd_cs5535audio_remove(struct pci_dev *pci)
 {
         olpc_quirks_cleanup();
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
-}
-
-static struct pci_driver driver = {
-        .name = DRIVER_NAME,
+}
+
+static struct pci_driver cs5535audio_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_cs5535audio_ids,
         .probe = snd_cs5535audio_probe,
-        .remove = __devexit_p(snd_cs5535audio_remove),
-#ifdef CONFIG_PM
-        .suspend = snd_cs5535audio_suspend,
-        .resume = snd_cs5535audio_resume,
+        .remove = snd_cs5535audio_remove,
+#ifdef CONFIG_PM_SLEEP
+        .driver = {
+                .pm = &snd_cs5535audio_pm,
+        },
 #endif
 };
 
-static int __init alsa_card_cs5535audio_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_cs5535audio_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_cs5535audio_init)
-module_exit(alsa_card_cs5535audio_exit)
+module_pci_driver(cs5535audio_driver);
 
 MODULE_AUTHOR("Jaya Kumar");