diff options
| author | Thomas Weißschuh <linux@weissschuh.net> | 2024-12-02 20:01:32 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.com> | 2024-12-11 15:11:04 +0100 |
| commit | 725bf3d8faab91cfd55e275752509fed851da643 (patch) | |
| tree | 95e3abf3721ddd2fa1c3930e1eaf55671edc8300 | |
| parent | 2a770b49b1bf00fca5473cb386eaf36d21d17d4b (diff) | |
HID: core: use utility macros to define sysfs attributes
Save some lines of code and prepare for the constification of
'struct bin_attribute'.
Also align the definitions within the source file.
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Jiri Kosina <jkosina@suse.com>
| -rw-r--r-- | drivers/hid/hid-core.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 33a191973324..e35cf426c16f 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2174,9 +2174,9 @@ static bool hid_hiddev(struct hid_device *hdev) static ssize_t -read_report_descriptor(struct file *filp, struct kobject *kobj, - struct bin_attribute *attr, - char *buf, loff_t off, size_t count) +report_descriptor_read(struct file *filp, struct kobject *kobj, + struct bin_attribute *attr, + char *buf, loff_t off, size_t count) { struct device *dev = kobj_to_dev(kobj); struct hid_device *hdev = to_hid_device(dev); @@ -2193,24 +2193,17 @@ read_report_descriptor(struct file *filp, struct kobject *kobj, } static ssize_t -show_country(struct device *dev, struct device_attribute *attr, - char *buf) +country_show(struct device *dev, struct device_attribute *attr, + char *buf) { struct hid_device *hdev = to_hid_device(dev); return sprintf(buf, "%02x\n", hdev->country & 0xff); } -static struct bin_attribute dev_bin_attr_report_desc = { - .attr = { .name = "report_descriptor", .mode = 0444 }, - .read = read_report_descriptor, - .size = HID_MAX_DESCRIPTOR_SIZE, -}; +static BIN_ATTR_RO(report_descriptor, HID_MAX_DESCRIPTOR_SIZE); -static const struct device_attribute dev_attr_country = { - .attr = { .name = "country", .mode = 0444 }, - .show = show_country, -}; +static const DEVICE_ATTR_RO(country); int hid_connect(struct hid_device *hdev, unsigned int connect_mask) { @@ -2801,7 +2794,7 @@ static struct attribute *hid_dev_attrs[] = { NULL, }; static struct bin_attribute *hid_dev_bin_attrs[] = { - &dev_bin_attr_report_desc, + &bin_attr_report_descriptor, NULL }; static const struct attribute_group hid_dev_group = { |