microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
Christoph Hellwig 2015-10-03 15:32:40 +02:00 коммит произвёл Nicholas Bellinger
Родитель 76e0da34c7
Коммит da4e527cd8
1 изменённых файлов: 14 добавлений и 20 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

34
drivers/usb/gadget/function/f_hid.c
Просмотреть файл

@ -713,9 +713,6 @@ static inline struct f_hid_opts *to_f_hid_opts(struct config_item *item)
func_inst.group); func_inst.group);
} }
CONFIGFS_ATTR_STRUCT(f_hid_opts);
CONFIGFS_ATTR_OPS(f_hid_opts);
static void hid_attr_release(struct config_item *item) static void hid_attr_release(struct config_item *item)
{ {
struct f_hid_opts *opts = to_f_hid_opts(item); struct f_hid_opts *opts = to_f_hid_opts(item);
@ -725,13 +722,12 @@ static void hid_attr_release(struct config_item *item)
static struct configfs_item_operations hidg_item_ops = { static struct configfs_item_operations hidg_item_ops = {
.release = hid_attr_release, .release = hid_attr_release,
.show_attribute = f_hid_opts_attr_show,
.store_attribute = f_hid_opts_attr_store,
}; };
#define F_HID_OPT(name, prec, limit) \ #define F_HID_OPT(name, prec, limit) \
static ssize_t f_hid_opts_##name##_show(struct f_hid_opts *opts, char *page)\ static ssize_t f_hid_opts_##name##_show(struct config_item *item, char *page)\
{ \ { \
struct f_hid_opts *opts = to_f_hid_opts(item); \
int result; \ int result; \
\ \
mutex_lock(&opts->lock); \ mutex_lock(&opts->lock); \
@ -741,9 +737,10 @@ static ssize_t f_hid_opts_##name##_show(struct f_hid_opts *opts, char *page)\
return result; \ return result; \
} \ } \
\ \
static ssize_t f_hid_opts_##name##_store(struct f_hid_opts *opts, \ static ssize_t f_hid_opts_##name##_store(struct config_item *item, \
const char *page, size_t len) \ const char *page, size_t len) \
{ \ { \
struct f_hid_opts *opts = to_f_hid_opts(item); \
int ret; \ int ret; \
u##prec num; \ u##prec num; \
\ \
@ -769,16 +766,15 @@ end: \
return ret; \ return ret; \
} \ } \
\ \
static struct f_hid_opts_attribute f_hid_opts_##name = \ CONFIGFS_ATTR(f_hid_opts_, name)
__CONFIGFS_ATTR(name, S_IRUGO | S_IWUSR, f_hid_opts_##name##_show,\
f_hid_opts_##name##_store)
F_HID_OPT(subclass, 8, 255); F_HID_OPT(subclass, 8, 255);
F_HID_OPT(protocol, 8, 255); F_HID_OPT(protocol, 8, 255);
F_HID_OPT(report_length, 16, 65535); F_HID_OPT(report_length, 16, 65535);
static ssize_t f_hid_opts_report_desc_show(struct f_hid_opts *opts, char *page) static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page)
{ {
struct f_hid_opts *opts = to_f_hid_opts(item);
int result; int result;
mutex_lock(&opts->lock); mutex_lock(&opts->lock);
@ -789,9 +785,10 @@ static ssize_t f_hid_opts_report_desc_show(struct f_hid_opts *opts, char *page)
return result; return result;
} }
static ssize_t f_hid_opts_report_desc_store(struct f_hid_opts *opts, static ssize_t f_hid_opts_report_desc_store(struct config_item *item,
const char *page, size_t len) const char *page, size_t len)
{ {
struct f_hid_opts *opts = to_f_hid_opts(item);
int ret = -EBUSY; int ret = -EBUSY;
char *d; char *d;
@ -818,16 +815,13 @@ end:
return ret; return ret;
} }
static struct f_hid_opts_attribute f_hid_opts_report_desc = CONFIGFS_ATTR(f_hid_opts_, report_desc);
__CONFIGFS_ATTR(report_desc, S_IRUGO | S_IWUSR,
f_hid_opts_report_desc_show,
f_hid_opts_report_desc_store);
static struct configfs_attribute *hid_attrs[] = { static struct configfs_attribute *hid_attrs[] = {
&f_hid_opts_subclass.attr, &f_hid_opts_attr_subclass,
&f_hid_opts_protocol.attr, &f_hid_opts_attr_protocol,
&f_hid_opts_report_length.attr, &f_hid_opts_attr_report_length,
&f_hid_opts_report_desc.attr, &f_hid_opts_attr_report_desc,
NULL, NULL,
}; };