Skip to content

Commit a6e8ecb

Browse files
morimototiwai
authored andcommitted
ALSA: core: use snd_kcontrol_chip()
We can use snd_kcontrol_chip(). Let's use it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://patch.msgid.link/87selhaudp.wl-kuninori.morimoto.gx@renesas.com
1 parent ee4023b commit a6e8ecb

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

sound/core/control.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1405,7 +1405,7 @@ static bool check_user_elem_overflow(struct snd_card *card, ssize_t add)
14051405
static int snd_ctl_elem_user_info(struct snd_kcontrol *kcontrol,
14061406
struct snd_ctl_elem_info *uinfo)
14071407
{
1408-
struct user_element *ue = kcontrol->private_data;
1408+
struct user_element *ue = snd_kcontrol_chip(kcontrol);
14091409
unsigned int offset;
14101410

14111411
offset = snd_ctl_get_ioff(kcontrol, &uinfo->id);
@@ -1418,7 +1418,7 @@ static int snd_ctl_elem_user_info(struct snd_kcontrol *kcontrol,
14181418
static int snd_ctl_elem_user_enum_info(struct snd_kcontrol *kcontrol,
14191419
struct snd_ctl_elem_info *uinfo)
14201420
{
1421-
struct user_element *ue = kcontrol->private_data;
1421+
struct user_element *ue = snd_kcontrol_chip(kcontrol);
14221422
const char *names;
14231423
unsigned int item;
14241424
unsigned int offset;
@@ -1443,7 +1443,7 @@ static int snd_ctl_elem_user_enum_info(struct snd_kcontrol *kcontrol,
14431443
static int snd_ctl_elem_user_get(struct snd_kcontrol *kcontrol,
14441444
struct snd_ctl_elem_value *ucontrol)
14451445
{
1446-
struct user_element *ue = kcontrol->private_data;
1446+
struct user_element *ue = snd_kcontrol_chip(kcontrol);
14471447
unsigned int size = ue->elem_data_size;
14481448
char *src = ue->elem_data +
14491449
snd_ctl_get_ioff(kcontrol, &ucontrol->id) * size;
@@ -1456,7 +1456,7 @@ static int snd_ctl_elem_user_put(struct snd_kcontrol *kcontrol,
14561456
struct snd_ctl_elem_value *ucontrol)
14571457
{
14581458
int err, change;
1459-
struct user_element *ue = kcontrol->private_data;
1459+
struct user_element *ue = snd_kcontrol_chip(kcontrol);
14601460
unsigned int size = ue->elem_data_size;
14611461
char *dst = ue->elem_data +
14621462
snd_ctl_get_ioff(kcontrol, &ucontrol->id) * size;
@@ -1475,7 +1475,7 @@ static int snd_ctl_elem_user_put(struct snd_kcontrol *kcontrol,
14751475
static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
14761476
unsigned int size)
14771477
{
1478-
struct user_element *ue = kctl->private_data;
1478+
struct user_element *ue = snd_kcontrol_chip(kctl);
14791479
unsigned int *container;
14801480
unsigned int mask = 0;
14811481
int i;
@@ -1528,7 +1528,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
15281528
static int read_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
15291529
unsigned int size)
15301530
{
1531-
struct user_element *ue = kctl->private_data;
1531+
struct user_element *ue = snd_kcontrol_chip(kctl);
15321532

15331533
if (ue->tlv_data_size == 0 || ue->tlv_data == NULL)
15341534
return -ENXIO;
@@ -1598,7 +1598,7 @@ static size_t compute_user_elem_size(size_t size, unsigned int count)
15981598

15991599
static void snd_ctl_elem_user_free(struct snd_kcontrol *kcontrol)
16001600
{
1601-
struct user_element *ue = kcontrol->private_data;
1601+
struct user_element *ue = snd_kcontrol_chip(kcontrol);
16021602

16031603
// decrement the allocation size.
16041604
ue->card->user_ctl_alloc_size -= compute_user_elem_size(ue->elem_data_size, kcontrol->count);

0 commit comments

Comments
 (0)