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

Commit 495702bc authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

usb-gadget/f_uac2: use per-attribute show and store methods 



To simplify the configfs interface and remove boilerplate code that also
causes binary bloat.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent c6f89f1c

drivers/usb/gadget/function/f_uac2.c

+11 −17
Original line number Diff line number Diff line
@@ -1445,9 +1445,6 @@ static inline struct f_uac2_opts *to_f_uac2_opts(struct config_item *item) 
			    func_inst.group);

}



CONFIGFS_ATTR_STRUCT(f_uac2_opts);

CONFIGFS_ATTR_OPS(f_uac2_opts);



static void f_uac2_attr_release(struct config_item *item)

{

	struct f_uac2_opts *opts = to_f_uac2_opts(item);
@@ -1457,14 +1454,13 @@ static void f_uac2_attr_release(struct config_item *item) 


static struct configfs_item_operations f_uac2_item_ops = {

	.release	= f_uac2_attr_release,

	.show_attribute	= f_uac2_opts_attr_show,

	.store_attribute = f_uac2_opts_attr_store,

};



#define UAC2_ATTRIBUTE(name)						\

static ssize_t f_uac2_opts_##name##_show(struct f_uac2_opts *opts,	\

static ssize_t f_uac2_opts_##name##_show(struct config_item *item,	\

					 char *page)			\

{									\

	struct f_uac2_opts *opts = to_f_uac2_opts(item);		\

	int result;							\

									\

	mutex_lock(&opts->lock);					\
@@ -1474,9 +1470,10 @@ static ssize_t f_uac2_opts_##name##_show(struct f_uac2_opts *opts, \ 
	return result;							\

}									\

									\

static ssize_t f_uac2_opts_##name##_store(struct f_uac2_opts *opts,	\

static ssize_t f_uac2_opts_##name##_store(struct config_item *item,	\

					  const char *page, size_t len)	\

{									\

	struct f_uac2_opts *opts = to_f_uac2_opts(item);		\

	int ret;							\

	u32 num;							\

									\
@@ -1498,10 +1495,7 @@ end: \ 
	return ret;							\

}									\

									\

static struct f_uac2_opts_attribute f_uac2_opts_##name =		\

	__CONFIGFS_ATTR(name, S_IRUGO | S_IWUSR,			\

			f_uac2_opts_##name##_show,			\

			f_uac2_opts_##name##_store)

CONFIGFS_ATTR(f_uac2_opts_, name)



UAC2_ATTRIBUTE(p_chmask);

UAC2_ATTRIBUTE(p_srate);
@@ -1511,12 +1505,12 @@ UAC2_ATTRIBUTE(c_srate); 
UAC2_ATTRIBUTE(c_ssize);



static struct configfs_attribute *f_uac2_attrs[] = {

	&f_uac2_opts_p_chmask.attr,

	&f_uac2_opts_p_srate.attr,

	&f_uac2_opts_p_ssize.attr,

	&f_uac2_opts_c_chmask.attr,

	&f_uac2_opts_c_srate.attr,

	&f_uac2_opts_c_ssize.attr,

	&f_uac2_opts_attr_p_chmask,

	&f_uac2_opts_attr_p_srate,

	&f_uac2_opts_attr_p_ssize,

	&f_uac2_opts_attr_c_chmask,

	&f_uac2_opts_attr_c_srate,

	&f_uac2_opts_attr_c_ssize,

	NULL,

};