@@ -547,7 +547,7 @@ int snd_usb_set_cur_mix_value(struct usb_mixer_elem_info *cval, int channel,
547547int snd_usb_mixer_vol_tlv (struct snd_kcontrol * kcontrol , int op_flag ,
548548 unsigned int size , unsigned int __user * _tlv )
549549{
550- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
550+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
551551 DECLARE_TLV_DB_MINMAX (scale , 0 , 0 );
552552
553553 if (size < sizeof (scale ))
@@ -1367,7 +1367,7 @@ static int get_max_exposed(struct usb_mixer_elem_info *cval)
13671367static int mixer_ctl_feature_info (struct snd_kcontrol * kcontrol ,
13681368 struct snd_ctl_elem_info * uinfo )
13691369{
1370- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
1370+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
13711371
13721372 if (cval -> val_type == USB_MIXER_BOOLEAN ||
13731373 cval -> val_type == USB_MIXER_INV_BOOLEAN )
@@ -1399,7 +1399,7 @@ static int mixer_ctl_feature_info(struct snd_kcontrol *kcontrol,
13991399static int mixer_ctl_feature_get (struct snd_kcontrol * kcontrol ,
14001400 struct snd_ctl_elem_value * ucontrol )
14011401{
1402- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
1402+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
14031403 int c , cnt , val , err ;
14041404
14051405 ucontrol -> value .integer .value [0 ] = cval -> min ;
@@ -1431,7 +1431,7 @@ static int mixer_ctl_feature_get(struct snd_kcontrol *kcontrol,
14311431static int mixer_ctl_feature_put (struct snd_kcontrol * kcontrol ,
14321432 struct snd_ctl_elem_value * ucontrol )
14331433{
1434- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
1434+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
14351435 int max_val = get_max_exposed (cval );
14361436 int c , cnt , val , oval , err ;
14371437 int changed = 0 ;
@@ -1475,7 +1475,7 @@ static int mixer_ctl_feature_put(struct snd_kcontrol *kcontrol,
14751475static int mixer_ctl_master_bool_get (struct snd_kcontrol * kcontrol ,
14761476 struct snd_ctl_elem_value * ucontrol )
14771477{
1478- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
1478+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
14791479 int val , err ;
14801480
14811481 err = snd_usb_get_cur_mix_value (cval , 0 , 0 , & val );
@@ -1543,7 +1543,7 @@ static int get_connector_value(struct usb_mixer_elem_info *cval,
15431543static int mixer_ctl_connector_get (struct snd_kcontrol * kcontrol ,
15441544 struct snd_ctl_elem_value * ucontrol )
15451545{
1546- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
1546+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
15471547 int ret , val ;
15481548
15491549 ret = get_connector_value (cval , kcontrol -> id .name , & val );
@@ -2302,7 +2302,7 @@ static int parse_audio_mixer_unit(struct mixer_build *state, int unitid,
23022302static int mixer_ctl_procunit_get (struct snd_kcontrol * kcontrol ,
23032303 struct snd_ctl_elem_value * ucontrol )
23042304{
2305- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
2305+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
23062306 int err , val ;
23072307
23082308 err = get_cur_ctl_value (cval , cval -> control << 8 , & val );
@@ -2319,7 +2319,7 @@ static int mixer_ctl_procunit_get(struct snd_kcontrol *kcontrol,
23192319static int mixer_ctl_procunit_put (struct snd_kcontrol * kcontrol ,
23202320 struct snd_ctl_elem_value * ucontrol )
23212321{
2322- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
2322+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
23232323 int val , oval , err ;
23242324
23252325 err = get_cur_ctl_value (cval , cval -> control << 8 , & oval );
@@ -2654,7 +2654,7 @@ static int parse_audio_extension_unit(struct mixer_build *state, int unitid,
26542654static int mixer_ctl_selector_info (struct snd_kcontrol * kcontrol ,
26552655 struct snd_ctl_elem_info * uinfo )
26562656{
2657- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
2657+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
26582658 const char * * itemlist = (const char * * )kcontrol -> private_value ;
26592659
26602660 if (snd_BUG_ON (!itemlist ))
@@ -2666,7 +2666,7 @@ static int mixer_ctl_selector_info(struct snd_kcontrol *kcontrol,
26662666static int mixer_ctl_selector_get (struct snd_kcontrol * kcontrol ,
26672667 struct snd_ctl_elem_value * ucontrol )
26682668{
2669- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
2669+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
26702670 int val , err ;
26712671
26722672 err = get_cur_ctl_value (cval , cval -> control << 8 , & val );
@@ -2683,7 +2683,7 @@ static int mixer_ctl_selector_get(struct snd_kcontrol *kcontrol,
26832683static int mixer_ctl_selector_put (struct snd_kcontrol * kcontrol ,
26842684 struct snd_ctl_elem_value * ucontrol )
26852685{
2686- struct usb_mixer_elem_info * cval = kcontrol -> private_data ;
2686+ struct usb_mixer_elem_info * cval = snd_kcontrol_chip ( kcontrol ) ;
26872687 int val , oval , err ;
26882688
26892689 err = get_cur_ctl_value (cval , cval -> control << 8 , & oval );
0 commit comments