summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-02-05 18:10:00 +0300
committerTakashi Iwai <tiwai@suse.de>2019-02-06 20:11:58 +0300
commit9725752867cb158e076bcb6bc4bdb35d9710b1bd (patch)
tree9532aaa200b4d7b3edf5d636a9b8070fb209bff6
parent7449054af0dcfa2839bb2da0a393bd35cf08daff (diff)
downloadlinux-9725752867cb158e076bcb6bc4bdb35d9710b1bd.tar.xz
ALSA: info: Drop unused snd_info_entry.card field
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>
-rw-r--r--include/sound/info.h1
-rw-r--r--sound/core/info.c4
-rw-r--r--sound/core/init.c6
3 files changed, 5 insertions, 6 deletions
diff --git a/include/sound/info.h b/include/sound/info.h
index 96530f7599e1..97fdda41e076 100644
--- a/include/sound/info.h
+++ b/include/sound/info.h
@@ -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);
diff --git a/sound/core/info.c b/sound/core/info.c
index 6c149fa54d2d..4d23069e7928 100644
--- a/sound/core/info.c
+++ b/sound/core/info.c
@@ -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);
diff --git a/sound/core/init.c b/sound/core/init.c
index 4849c611c0fe..5252a9ce13dc 100644
--- a/sound/core/init.c
+++ b/sound/core/init.c
@@ -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);