1
0
Fork 0

Merge branch 'for-5.11/wacom' into for-linus

zero-sugar-mainline-defconfig
Jiri Kosina 2020-12-16 11:44:38 +01:00
commit 85a694738f
1 changed files with 8 additions and 8 deletions

View File

@ -1173,7 +1173,7 @@ static struct attribute *cintiq_led_attrs[] = {
NULL NULL
}; };
static struct attribute_group cintiq_led_attr_group = { static const struct attribute_group cintiq_led_attr_group = {
.name = "wacom_led", .name = "wacom_led",
.attrs = cintiq_led_attrs, .attrs = cintiq_led_attrs,
}; };
@ -1194,7 +1194,7 @@ static struct attribute *intuos4_led_attrs[] = {
NULL NULL
}; };
static struct attribute_group intuos4_led_attr_group = { static const struct attribute_group intuos4_led_attr_group = {
.name = "wacom_led", .name = "wacom_led",
.attrs = intuos4_led_attrs, .attrs = intuos4_led_attrs,
}; };
@ -1205,7 +1205,7 @@ static struct attribute *intuos5_led_attrs[] = {
NULL NULL
}; };
static struct attribute_group intuos5_led_attr_group = { static const struct attribute_group intuos5_led_attr_group = {
.name = "wacom_led", .name = "wacom_led",
.attrs = intuos5_led_attrs, .attrs = intuos5_led_attrs,
}; };
@ -1216,13 +1216,13 @@ static struct attribute *generic_led_attrs[] = {
NULL NULL
}; };
static struct attribute_group generic_led_attr_group = { static const struct attribute_group generic_led_attr_group = {
.name = "wacom_led", .name = "wacom_led",
.attrs = generic_led_attrs, .attrs = generic_led_attrs,
}; };
struct wacom_sysfs_group_devres { struct wacom_sysfs_group_devres {
struct attribute_group *group; const struct attribute_group *group;
struct kobject *root; struct kobject *root;
}; };
@ -1238,7 +1238,7 @@ static void wacom_devm_sysfs_group_release(struct device *dev, void *res)
static int __wacom_devm_sysfs_create_group(struct wacom *wacom, static int __wacom_devm_sysfs_create_group(struct wacom *wacom,
struct kobject *root, struct kobject *root,
struct attribute_group *group) const struct attribute_group *group)
{ {
struct wacom_sysfs_group_devres *devres; struct wacom_sysfs_group_devres *devres;
int error; int error;
@ -1264,7 +1264,7 @@ static int __wacom_devm_sysfs_create_group(struct wacom *wacom,
} }
static int wacom_devm_sysfs_create_group(struct wacom *wacom, static int wacom_devm_sysfs_create_group(struct wacom *wacom,
struct attribute_group *group) const struct attribute_group *group)
{ {
return __wacom_devm_sysfs_create_group(wacom, &wacom->hdev->dev.kobj, return __wacom_devm_sysfs_create_group(wacom, &wacom->hdev->dev.kobj,
group); group);
@ -1847,7 +1847,7 @@ static struct attribute *remote##SET_ID##_serial_attrs[] = { \
&remote##SET_ID##_mode_attr.attr, \ &remote##SET_ID##_mode_attr.attr, \
NULL \ NULL \
}; \ }; \
static struct attribute_group remote##SET_ID##_serial_group = { \ static const struct attribute_group remote##SET_ID##_serial_group = { \
.name = NULL, \ .name = NULL, \
.attrs = remote##SET_ID##_serial_attrs, \ .attrs = remote##SET_ID##_serial_attrs, \
} }