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

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

usb-gadget/f_uac1: 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 4a90cb20

drivers/usb/gadget/function/f_uac1.c

+16 −23
Original line number Diff line number Diff line
@@ -773,9 +773,6 @@ static inline struct f_uac1_opts *to_f_uac1_opts(struct config_item *item) 
			    func_inst.group);

}



CONFIGFS_ATTR_STRUCT(f_uac1_opts);

CONFIGFS_ATTR_OPS(f_uac1_opts);



static void f_uac1_attr_release(struct config_item *item)

{

	struct f_uac1_opts *opts = to_f_uac1_opts(item);
@@ -785,14 +782,13 @@ static void f_uac1_attr_release(struct config_item *item) 


static struct configfs_item_operations f_uac1_item_ops = {

	.release	= f_uac1_attr_release,

	.show_attribute	= f_uac1_opts_attr_show,

	.store_attribute = f_uac1_opts_attr_store,

};



#define UAC1_INT_ATTRIBUTE(name)					\

static ssize_t f_uac1_opts_##name##_show(struct f_uac1_opts *opts,	\

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

					 char *page)			\

{									\

	struct f_uac1_opts *opts = to_f_uac1_opts(item);		\

	int result;							\

									\

	mutex_lock(&opts->lock);					\
@@ -802,9 +798,10 @@ static ssize_t f_uac1_opts_##name##_show(struct f_uac1_opts *opts, \ 
	return result;							\

}									\

									\

static ssize_t f_uac1_opts_##name##_store(struct f_uac1_opts *opts,	\

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

					  const char *page, size_t len)	\

{									\

	struct f_uac1_opts *opts = to_f_uac1_opts(item);		\

	int ret;							\

	u32 num;							\

									\
@@ -826,19 +823,17 @@ end: \ 
	return ret;							\

}									\

									\

static struct f_uac1_opts_attribute f_uac1_opts_##name =		\

	__CONFIGFS_ATTR(name, S_IRUGO | S_IWUSR,			\

			f_uac1_opts_##name##_show,			\

			f_uac1_opts_##name##_store)

CONFIGFS_ATTR(f_uac1_opts_, name)



UAC1_INT_ATTRIBUTE(req_buf_size);

UAC1_INT_ATTRIBUTE(req_count);

UAC1_INT_ATTRIBUTE(audio_buf_size);



#define UAC1_STR_ATTRIBUTE(name)					\

static ssize_t f_uac1_opts_##name##_show(struct f_uac1_opts *opts,	\

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

					 char *page)			\

{									\

	struct f_uac1_opts *opts = to_f_uac1_opts(item);		\

	int result;							\

									\

	mutex_lock(&opts->lock);					\
@@ -848,9 +843,10 @@ static ssize_t f_uac1_opts_##name##_show(struct f_uac1_opts *opts, \ 
	return result;							\

}									\

									\

static ssize_t f_uac1_opts_##name##_store(struct f_uac1_opts *opts,	\

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

					  const char *page, size_t len)	\

{									\

	struct f_uac1_opts *opts = to_f_uac1_opts(item);		\

	int ret = -EBUSY;						\

	char *tmp;							\

									\
@@ -874,22 +870,19 @@ end: \ 
	return ret;							\

}									\

									\

static struct f_uac1_opts_attribute f_uac1_opts_##name =		\

	__CONFIGFS_ATTR(name, S_IRUGO | S_IWUSR,			\

			f_uac1_opts_##name##_show,			\

			f_uac1_opts_##name##_store)

CONFIGFS_ATTR(f_uac1_opts_, name)



UAC1_STR_ATTRIBUTE(fn_play);

UAC1_STR_ATTRIBUTE(fn_cap);

UAC1_STR_ATTRIBUTE(fn_cntl);



static struct configfs_attribute *f_uac1_attrs[] = {

	&f_uac1_opts_req_buf_size.attr,

	&f_uac1_opts_req_count.attr,

	&f_uac1_opts_audio_buf_size.attr,

	&f_uac1_opts_fn_play.attr,

	&f_uac1_opts_fn_cap.attr,

	&f_uac1_opts_fn_cntl.attr,

	&f_uac1_opts_attr_req_buf_size,

	&f_uac1_opts_attr_req_count,

	&f_uac1_opts_attr_audio_buf_size,

	&f_uac1_opts_attr_fn_play,

	&f_uac1_opts_attr_fn_cap,

	&f_uac1_opts_attr_fn_cntl,

	NULL,

};