hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/sound/pci/emu10k1/emu10k1.c
....@@ -1,26 +1,10 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * The driver for the EMU10K1 (SB Live!) based soundcards
34 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>
45 *
56 * Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
67 * Added support for Audigy 2 Value.
7
- *
8
- *
9
- * This program is free software; you can redistribute it and/or modify
10
- * it under the terms of the GNU General Public License as published by
11
- * the Free Software Foundation; either version 2 of the License, or
12
- * (at your option) any later version.
13
- *
14
- * This program is distributed in the hope that it will be useful,
15
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
16
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17
- * GNU General Public License for more details.
18
- *
19
- * You should have received a copy of the GNU General Public License
20
- * along with this program; if not, write to the Free Software
21
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
22
- *
23
- *
248 */
259
2610 #include <linux/init.h>
....@@ -140,8 +124,9 @@
140124 goto error;
141125 /* This stores the periods table. */
142126 if (emu->card_capabilities->ca0151_chip) { /* P16V */
143
- if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
144
- 1024, &emu->p16v_buffer)) < 0)
127
+ err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,
128
+ 1024, &emu->p16v_buffer);
129
+ if (err < 0)
145130 goto error;
146131 }
147132
....@@ -223,12 +208,6 @@
223208 emu->suspend = 1;
224209
225210 cancel_delayed_work_sync(&emu->emu1010.firmware_work);
226
-
227
- snd_pcm_suspend_all(emu->pcm);
228
- snd_pcm_suspend_all(emu->pcm_mic);
229
- snd_pcm_suspend_all(emu->pcm_efx);
230
- snd_pcm_suspend_all(emu->pcm_multi);
231
- snd_pcm_suspend_all(emu->pcm_p16v);
232211
233212 snd_ac97_suspend(emu->ac97);
234213