From: Kuninori Morimoto Date: Wed, 7 May 2025 04:59:15 +0000 (+0000) Subject: ALSA: sh: use snd_kcontrol_chip() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2086e63b9b1499483efb7a63838061bb4cf27612;p=users%2Fjedix%2Flinux-maple.git ALSA: sh: use snd_kcontrol_chip() We can use snd_kcontrol_chip(). Let's use it. Signed-off-by: Kuninori Morimoto Signed-off-by: Takashi Iwai Link: https://patch.msgid.link/87v7qdaue4.wl-kuninori.morimoto.gx@renesas.com --- diff --git a/sound/sh/aica.c b/sound/sh/aica.c index 5a93f45873563..f88331a486381 100644 --- a/sound/sh/aica.c +++ b/sound/sh/aica.c @@ -469,8 +469,8 @@ static int aica_pcmvolume_info(struct snd_kcontrol *kcontrol, static int aica_pcmvolume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_card_aica *dreamcastcard; - dreamcastcard = kcontrol->private_data; + struct snd_card_aica *dreamcastcard = snd_kcontrol_chip(kcontrol); + if (unlikely(!dreamcastcard->channel)) return -ETXTBSY; /* we've not yet been set up */ ucontrol->value.integer.value[0] = dreamcastcard->channel->vol; @@ -480,9 +480,9 @@ static int aica_pcmvolume_get(struct snd_kcontrol *kcontrol, static int aica_pcmvolume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_card_aica *dreamcastcard; + struct snd_card_aica *dreamcastcard = snd_kcontrol_chip(kcontrol); unsigned int vol; - dreamcastcard = kcontrol->private_data; + if (unlikely(!dreamcastcard->channel)) return -ETXTBSY; vol = ucontrol->value.integer.value[0];