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

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

usb-gadget/f_obex: 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 495702bc

drivers/usb/gadget/function/f_obex.c

+4 −22
Original line number Original line Diff line number Diff line
@@ -395,22 +395,6 @@ static inline struct f_serial_opts *to_f_serial_opts(struct config_item *item) 
			    func_inst.group);

			    func_inst.group);

}

}





CONFIGFS_ATTR_STRUCT(f_serial_opts);

static ssize_t f_obex_attr_show(struct config_item *item,

				struct configfs_attribute *attr,

				char *page)

{

	struct f_serial_opts *opts = to_f_serial_opts(item);

	struct f_serial_opts_attribute *f_serial_opts_attr =

		container_of(attr, struct f_serial_opts_attribute, attr);

	ssize_t ret = 0;



	if (f_serial_opts_attr->show)

		ret = f_serial_opts_attr->show(opts, page);



	return ret;

}



static void obex_attr_release(struct config_item *item)

static void obex_attr_release(struct config_item *item)

{

{

	struct f_serial_opts *opts = to_f_serial_opts(item);

	struct f_serial_opts *opts = to_f_serial_opts(item);
@@ -420,19 +404,17 @@ static void obex_attr_release(struct config_item *item) 




static struct configfs_item_operations obex_item_ops = {

static struct configfs_item_operations obex_item_ops = {

	.release	= obex_attr_release,

	.release	= obex_attr_release,

	.show_attribute = f_obex_attr_show,

};

};





static ssize_t f_obex_port_num_show(struct f_serial_opts *opts, char *page)

static ssize_t f_obex_port_num_show(struct config_item *item, char *page)

{

{

	return sprintf(page, "%u\n", opts->port_num);

	return sprintf(page, "%u\n", to_f_serial_opts(item)->port_num);

}

}





static struct f_serial_opts_attribute f_obex_port_num =

CONFIGFS_ATTR_RO(f_obex_, port_num);

	__CONFIGFS_ATTR_RO(port_num, f_obex_port_num_show);





static struct configfs_attribute *acm_attrs[] = {

static struct configfs_attribute *acm_attrs[] = {

	&f_obex_port_num.attr,

	&f_obex_attr_port_num,

	NULL,

	NULL,

};

};