diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-08-20 20:42:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-08-20 20:42:41 +0300 |
| commit | 5c40cd7db64a2949f268d7467b9be551a565d14b (patch) | |
| tree | fb8a67f6edcb0c9922c256a598d675c1c04051d6 /sound/i2c | |
| parent | 8bde384a2090759efc9b92f34300887d418a2a3a (diff) | |
| parent | 25bf10be219d37d2fb221c93816a913f5f735530 (diff) | |
| download | linux-rolling-stable.tar.xz | |
Merge v6.16.2linux-rolling-stable
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/i2c')
| -rw-r--r-- | sound/i2c/other/ak4117.c | 2 | ||||
| -rw-r--r-- | sound/i2c/other/pt2258.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/i2c/other/ak4117.c b/sound/i2c/other/ak4117.c index 657b331d7a79..cd380db195ef 100644 --- a/sound/i2c/other/ak4117.c +++ b/sound/i2c/other/ak4117.c @@ -504,7 +504,7 @@ int snd_ak4117_check_rate_and_errors(struct ak4117 *ak4117, unsigned int flags) static void snd_ak4117_timer(struct timer_list *t) { - struct ak4117 *chip = from_timer(chip, t, timer); + struct ak4117 *chip = timer_container_of(chip, t, timer); if (chip->init) return; diff --git a/sound/i2c/other/pt2258.c b/sound/i2c/other/pt2258.c index ba38c285241c..0fbac827124b 100644 --- a/sound/i2c/other/pt2258.c +++ b/sound/i2c/other/pt2258.c @@ -80,7 +80,7 @@ static int pt2258_stereo_volume_info(struct snd_kcontrol *kcontrol, static int pt2258_stereo_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); int base = kcontrol->private_value; /* chip does not support register reads */ @@ -92,7 +92,7 @@ static int pt2258_stereo_volume_get(struct snd_kcontrol *kcontrol, static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); int base = kcontrol->private_value; unsigned char bytes[2]; int val0, val1; @@ -133,7 +133,7 @@ static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol, static int pt2258_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); ucontrol->value.integer.value[0] = !pt->mute; return 0; @@ -142,7 +142,7 @@ static int pt2258_switch_get(struct snd_kcontrol *kcontrol, static int pt2258_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); unsigned char bytes[2]; int val; |