Changeset 679 for GPL/trunk/alsa-kernel/isa/cmi8330.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/isa/cmi8330.c (modified) (28 diffs)

GPL/trunk/alsa-kernel/isa/cmi8330.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for C-Media's CMI8330 and CMI8329 soundcards.
  *  Copyright (c) by George Talusan <gstalusan@uwaterloo.ca>
  *    http://www.undergrad.math.uwaterloo.ca/~gstalusa
- *
- *   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
- *
  */
 
@@ -48 +34 @@
 #include <linux/isa.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/wss.h>
@@ -70 +56 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
-#ifdef CONFIG_PNP
-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
+#ifdef CONFIG_PNP
+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #endif
 static long sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
@@ -96 +82 @@
 #endif
 
-module_param_array(sbport, long, NULL, 0444);
+module_param_hw_array(sbport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(sbport, "Port # for CMI8330/CMI8329 SB driver.");
-module_param_array(sbirq, int, NULL, 0444);
+module_param_hw_array(sbirq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330/CMI8329 SB driver.");
-module_param_array(sbdma8, int, NULL, 0444);
+module_param_hw_array(sbdma8, int, dma, NULL, 0444);
 MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330/CMI8329 SB driver.");
-module_param_array(sbdma16, int, NULL, 0444);
+module_param_hw_array(sbdma16, int, dma, NULL, 0444);
 MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330/CMI8329 SB driver.");
 
-module_param_array(wssport, long, NULL, 0444);
+module_param_hw_array(wssport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(wssport, "Port # for CMI8330/CMI8329 WSS driver.");
-module_param_array(wssirq, int, NULL, 0444);
+module_param_hw_array(wssirq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330/CMI8329 WSS driver.");
-module_param_array(wssdma, int, NULL, 0444);
+module_param_hw_array(wssdma, int, dma, NULL, 0444);
 MODULE_PARM_DESC(wssdma, "DMA for CMI8330/CMI8329 WSS driver.");
 
-module_param_array(fmport, long, NULL, 0444);
+module_param_hw_array(fmport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fmport, "FM port # for CMI8330/CMI8329 driver.");
-module_param_array(mpuport, long, NULL, 0444);
+module_param_hw_array(mpuport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8330/CMI8329 driver.");
-module_param_array(mpuirq, int, NULL, 0444);
+module_param_hw_array(mpuirq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8330/CMI8329 MPU-401 port.");
 #ifdef CONFIG_PNP
@@ -135 +121 @@
 #define CMI8330_CDINGAIN  26
 
-static unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =
+static const unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =
 {
         0x40,                   /* 16 - recording mux (SB-mixer-enabled) */
@@ -183 +169 @@
 #ifdef CONFIG_PNP
 
-static struct pnp_card_device_id snd_cmi8330_pnpids[] = {
+static const struct pnp_card_device_id snd_cmi8330_pnpids[] = {
         { .id = "CMI0001", .devs = { { "@X@0001" }, { "@@@0001" }, { "@H@0001" }, { "A@@0001" } } },
         { .id = "CMI0001", .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" } } },
@@ -194 +180 @@
 
 
-static struct snd_kcontrol_new snd_cmi8330_controls[] __devinitdata = {
+static const struct snd_kcontrol_new snd_cmi8330_controls[] = {
 WSS_DOUBLE("Master Playback Volume", 0,
                 CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),
@@ -250 +236 @@
 
 #ifdef ENABLE_SB_MIXER
-static struct sbmix_elem cmi8330_sb_mixers[] __devinitdata = {
+static const struct sbmix_elem cmi8330_sb_mixers[] = {
 SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),
 SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15),
@@ -268 +254 @@
 };
 
-static unsigned char cmi8330_sb_init_values[][2] __devinitdata = {
+static const unsigned char cmi8330_sb_init_values[][2] = {
         { SB_DSP4_MASTER_DEV + 0, 0 },
         { SB_DSP4_MASTER_DEV + 1, 0 },
@@ -282 +268 @@
 
 
-static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip)
+static int cmi8330_add_sb_mixers(struct snd_sb *chip)
 {
         int idx, err;
@@ -307 +293 @@
 #endif
 
-static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)
+static int snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)
 {
         unsigned int idx;
@@ -330 +316 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
-                                     struct pnp_card_link *card,
-                                     const struct pnp_card_device_id *id)
+static int snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
+                           struct pnp_card_link *card,
+                           const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
@@ -438 +424 @@
 }
 
-static int __devinit snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)
+static int snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)
 {
         struct snd_pcm *pcm;
         const struct snd_pcm_ops *ops;
         int err;
-        static snd_pcm_open_callback_t cmi_open_callbacks[2] = {
+        static const snd_pcm_open_callback_t cmi_open_callbacks[2] = {
                 snd_cmi8330_playback_open,
                 snd_cmi8330_capture_open
@@ -470 +456 @@
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &chip->streams[SNDRV_PCM_STREAM_CAPTURE].ops);
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024, 128*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       card->dev, 64*1024, 128*1024);
         chip->pcm = pcm;
 
@@ -485 +470 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        snd_pcm_suspend_all(acard->pcm);
         acard->wss->suspend(acard->wss);
         snd_sbmixer_suspend(acard->sb);
@@ -515 +499 @@
 #define PFX     "cmi8330: "
 
-static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)
+static int snd_cmi8330_card_new(struct device *pdev, int dev,
+                                struct snd_card **cardp)
 {
         struct snd_card *card;
@@ -521 +506 @@
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_cmi8330), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_cmi8330), &card);
         if (err < 0) {
                 snd_printk(KERN_ERR PFX "could not get a new card\n");
@@ -533 +518 @@
 }
 
-static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
+static int snd_cmi8330_probe(struct snd_card *card, int dev)
 {
         struct snd_cmi8330 *acard;
@@ -598 +583 @@
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
                                         mpuport[dev], 0, mpuirq[dev],
-                                        IRQF_DISABLED, NULL) < 0)
+                                        NULL) < 0)
                         printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n",
                                 mpuport[dev]);
@@ -614 +599 @@
 }
 
-static int __devinit snd_cmi8330_isa_match(struct device *pdev,
-                                           unsigned int dev)
+static int snd_cmi8330_isa_match(struct device *pdev,
+                                 unsigned int dev)
 {
         if (!enable[dev] || is_isapnp_selected(dev))
@@ -630 +615 @@
 }
 
-static int __devinit snd_cmi8330_isa_probe(struct device *pdev,
-                                           unsigned int dev)
+static int snd_cmi8330_isa_probe(struct device *pdev,
+                                 unsigned int dev)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_cmi8330_card_new(dev, &card);
+        err = snd_cmi8330_card_new(pdev, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, pdev);
         if ((err = snd_cmi8330_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -648 +632 @@
 }
 
-static int __devexit snd_cmi8330_isa_remove(struct device *devptr,
-                                            unsigned int dev)
+static int snd_cmi8330_isa_remove(struct device *devptr,
+                                  unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -674 +657 @@
         .match          = snd_cmi8330_isa_match,
         .probe          = snd_cmi8330_isa_probe,
-        .remove         = __devexit_p(snd_cmi8330_isa_remove),
+        .remove         = snd_cmi8330_isa_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cmi8330_isa_suspend,
@@ -686 +669 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
-                                            const struct pnp_card_device_id *pid)
+static int snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
+                                  const struct pnp_card_device_id *pid)
 {
         static int dev;
@@ -700 +683 @@
                 return -ENODEV;
                                
-        res = snd_cmi8330_card_new(dev, &card);
+        res = snd_cmi8330_card_new(&pcard->card->dev, dev, &card);
         if (res < 0)
                 return res;
@@ -708 +691 @@
                 return res;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
         if ((res = snd_cmi8330_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -718 +700 @@
 }
 
-static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard)
+static void snd_cmi8330_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -741 +723 @@
         .id_table = snd_cmi8330_pnpids,
         .probe = snd_cmi8330_pnp_detect,
-        .remove = __devexit_p(snd_cmi8330_pnp_remove),
+        .remove = snd_cmi8330_pnp_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cmi8330_pnp_suspend,