| .. | .. |
|---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-or-later |
|---|
| 1 | 2 | /* |
|---|
| 2 | 3 | * Copyright (c) by Jaroslav Kysela <perex@perex.cz> |
|---|
| 3 | 4 | * 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 | | - * |
|---|
| 20 | 5 | */ |
|---|
| 21 | 6 | |
|---|
| 22 | 7 | #include <linux/slab.h> |
|---|
| .. | .. |
|---|
| 238 | 223 | { |
|---|
| 239 | 224 | struct snd_gf1_mem *alloc; |
|---|
| 240 | 225 | struct snd_gf1_mem_block block; |
|---|
| 241 | | -#ifdef CONFIG_SND_DEBUG |
|---|
| 242 | | - struct snd_info_entry *entry; |
|---|
| 243 | | -#endif |
|---|
| 244 | 226 | |
|---|
| 245 | 227 | alloc = &gus->gf1.mem_alloc; |
|---|
| 246 | 228 | mutex_init(&alloc->memory_mutex); |
|---|
| .. | .. |
|---|
| 263 | 245 | if (snd_gf1_mem_xalloc(alloc, &block) == NULL) |
|---|
| 264 | 246 | return -ENOMEM; |
|---|
| 265 | 247 | #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); |
|---|
| 268 | 249 | #endif |
|---|
| 269 | 250 | return 0; |
|---|
| 270 | 251 | } |
|---|
| .. | .. |
|---|
| 310 | 291 | used = 0; |
|---|
| 311 | 292 | for (block = alloc->first, i = 0; block; block = block->next, i++) { |
|---|
| 312 | 293 | 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); |
|---|
| 314 | 295 | if (block->share || |
|---|
| 315 | 296 | block->share_id[0] || block->share_id[1] || |
|---|
| 316 | 297 | block->share_id[2] || block->share_id[3]) |
|---|