forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-10-22 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5
kernel/sound/isa/gus/gus_mem.c
....@@ -1,22 +1,7 @@
1
+// SPDX-License-Identifier: GPL-2.0-or-later
12 /*
23 * Copyright (c) by Jaroslav Kysela <perex@perex.cz>
34 * GUS's memory allocation routines / bottom layer
4
- *
5
- *
6
- * This program is free software; you can redistribute it and/or modify
7
- * it under the terms of the GNU General Public License as published by
8
- * the Free Software Foundation; either version 2 of the License, or
9
- * (at your option) any later version.
10
- *
11
- * This program is distributed in the hope that it will be useful,
12
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
13
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14
- * GNU General Public License for more details.
15
- *
16
- * You should have received a copy of the GNU General Public License
17
- * along with this program; if not, write to the Free Software
18
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19
- *
205 */
216
227 #include <linux/slab.h>
....@@ -238,9 +223,6 @@
238223 {
239224 struct snd_gf1_mem *alloc;
240225 struct snd_gf1_mem_block block;
241
-#ifdef CONFIG_SND_DEBUG
242
- struct snd_info_entry *entry;
243
-#endif
244226
245227 alloc = &gus->gf1.mem_alloc;
246228 mutex_init(&alloc->memory_mutex);
....@@ -263,8 +245,7 @@
263245 if (snd_gf1_mem_xalloc(alloc, &block) == NULL)
264246 return -ENOMEM;
265247 #ifdef CONFIG_SND_DEBUG
266
- if (! snd_card_proc_new(gus->card, "gusmem", &entry))
267
- snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);
248
+ snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read);
268249 #endif
269250 return 0;
270251 }
....@@ -310,7 +291,7 @@
310291 used = 0;
311292 for (block = alloc->first, i = 0; block; block = block->next, i++) {
312293 used += block->size;
313
- snd_iprintf(buffer, "Block %i at 0x%lx onboard 0x%x size %i (0x%x):\n", i, (long) block, block->ptr, block->size, block->size);
294
+ snd_iprintf(buffer, "Block %i onboard 0x%x size %i (0x%x):\n", i, block->ptr, block->size, block->size);
314295 if (block->share ||
315296 block->share_id[0] || block->share_id[1] ||
316297 block->share_id[2] || block->share_id[3])