Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 254b3bf6 authored by Daniel Mack's avatar Daniel Mack Committed by Felipe Balbi
Browse files

usb: gadget: f_uac2: introduce agdev_to_uac2_opts 



Add a simple container_of() wrapper to get a struct f_uac2_opts from a
struct struct audio_dev. Use it in two places where it is currently
open-coded.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent a8147dab

drivers/usb/gadget/function/f_uac2.c

+8 −2
Original line number Diff line number Diff line
@@ -139,6 +139,12 @@ struct snd_uac2_chip *pdev_to_uac2(struct platform_device *p) 
	return container_of(p, struct snd_uac2_chip, pdev);

}



static inline

struct f_uac2_opts *agdev_to_uac2_opts(struct audio_dev *agdev)

{

	return container_of(agdev->func.fi, struct f_uac2_opts, func_inst);

}



static inline

uint num_channels(uint chanmask)

{
@@ -1168,7 +1174,7 @@ in_rq_cur(struct usb_function *fn, const struct usb_ctrlrequest *cr) 
	int value = -EOPNOTSUPP;

	int p_srate, c_srate;



	opts = container_of(agdev->func.fi, struct f_uac2_opts, func_inst);

	opts = agdev_to_uac2_opts(agdev);

	p_srate = opts->p_srate;

	c_srate = opts->c_srate;
@@ -1210,7 +1216,7 @@ in_rq_range(struct usb_function *fn, const struct usb_ctrlrequest *cr) 
	int value = -EOPNOTSUPP;

	int p_srate, c_srate;



	opts = container_of(agdev->func.fi, struct f_uac2_opts, func_inst);

	opts = agdev_to_uac2_opts(agdev);

	p_srate = opts->p_srate;

	c_srate = opts->c_srate;