Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-10 14:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: info: Drop unused snd_info_entry.card field

Browse Source 
It's referred only in snd_card_id_read() which can receive the card
object via private_data.

Reviewed-by: Jaroslav Kysela <perex@perex.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2019-02-05 16:10:00 +01:00
parent 7449054af0
commit 9725752867
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/info.h
View File

@ -82,7 +82,6 @@ struct snd_info_entry {
struct snd_info_entry_ops *ops;
} c;
struct snd_info_entry *parent;
struct snd_card *card;
struct module *module;
void *private_data;
void (*private_free)(struct snd_info_entry *entry);

4
sound/core/info.c
View File

@ -750,10 +750,8 @@ struct snd_info_entry *snd_info_create_card_entry(struct snd_card *card,
if (!parent)
parent = card->proc_root;
entry = snd_info_create_entry(name, parent);
if (entry) {
if (entry)
entry->module = card->module;
entry->card = card;
}
return entry;
}
EXPORT_SYMBOL(snd_info_create_card_entry);

6
sound/core/init.c
View File

@ -104,7 +104,9 @@ EXPORT_SYMBOL(snd_mixer_oss_notify_callback);
static void snd_card_id_read(struct snd_info_entry *entry,
struct snd_info_buffer *buffer)
{
snd_iprintf(buffer, "%s\n", entry->card->id);
struct snd_card *card = entry->private_data;
snd_iprintf(buffer, "%s\n", card->id);
}
static int init_info_for_card(struct snd_card *card)
@ -116,7 +118,7 @@ static int init_info_for_card(struct snd_card *card)
dev_dbg(card->dev, "unable to create card entry\n");
return -ENOMEM;
}
entry->c.text.read = snd_card_id_read;
snd_info_set_text_ops(entry, card, snd_card_id_read);
card->proc_id = entry;
return snd_info_card_register(card);