forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/sound/isa/msnd/msnd_pinnacle.c
....@@ -1,3 +1,4 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*********************************************************************
23 *
34 * Linux multisound pinnacle/fiji driver for ALSA.
....@@ -9,7 +10,6 @@
910 * to make it easier for some brave heart to implemt classic
1011 * support in alsa, i left all the MSND_CLASSIC tokens in this file.
1112 * but for now this untested & undone.
12
- *
1313 *
1414 * ripped from linux kernel 2.4.18 by Karsten Wiese.
1515 *
....@@ -29,20 +29,6 @@
2929 * 12-3-2000 Modified IO port validation Steve Sycamore
3030 *
3131 * Copyright (C) 1998 Andrew Veliath
32
- *
33
- * This program is free software; you can redistribute it and/or modify
34
- * it under the terms of the GNU General Public License as published by
35
- * the Free Software Foundation; either version 2 of the License, or
36
- * (at your option) any later version.
37
- *
38
- * This program is distributed in the hope that it will be useful,
39
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
40
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
41
- * GNU General Public License for more details.
42
- *
43
- * You should have received a copy of the GNU General Public License
44
- * along with this program; if not, write to the Free Software
45
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4632 *
4733 ********************************************************************/
4834
....@@ -542,7 +528,7 @@
542528 {
543529 struct snd_msnd *chip = card->private_data;
544530 int err;
545
- static struct snd_device_ops ops = {
531
+ static const struct snd_device_ops ops = {
546532 .dev_free = snd_msnd_dev_free,
547533 };
548534
....@@ -552,6 +538,7 @@
552538 printk(KERN_ERR LOGNAME ": Couldn't grab IRQ %d\n", chip->irq);
553539 return err;
554540 }
541
+ card->sync_irq = chip->irq;
555542 if (request_region(chip->io, DSP_NUMIO, card->shortname) == NULL) {
556543 free_irq(chip->irq, chip);
557544 return -EBUSY;
....@@ -565,7 +552,7 @@
565552 free_irq(chip->irq, chip);
566553 return -EBUSY;
567554 }
568
- chip->mappedbase = ioremap_nocache(chip->base, 0x8000);
555
+ chip->mappedbase = ioremap(chip->base, 0x8000);
569556 if (!chip->mappedbase) {
570557 printk(KERN_ERR LOGNAME
571558 ": unable to map memory region 0x%lx-0x%lx\n",