Skip to content

Commit aaf4f13

Browse files
author
Jiri Kosina
committed
Merge branch 'for-4.14/constify-attribute_group' into for-linus
- struct attribute_group constification from Arvind Yadav
2 parents b11918b + 1d710da commit aaf4f13

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/hid/hid-logitech-hidpp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2926,7 +2926,7 @@ static struct attribute *sysfs_attrs[] = {
29262926
NULL
29272927
};
29282928

2929-
static struct attribute_group ps_attribute_group = {
2929+
static const struct attribute_group ps_attribute_group = {
29302930
.attrs = sysfs_attrs
29312931
};
29322932

drivers/hid/hid-multitouch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ static struct attribute *sysfs_attrs[] = {
341341
NULL
342342
};
343343

344-
static struct attribute_group mt_attribute_group = {
344+
static const struct attribute_group mt_attribute_group = {
345345
.attrs = sysfs_attrs
346346
};
347347

drivers/hid/hid-ntrig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ static struct attribute *sysfs_attrs[] = {
445445
NULL
446446
};
447447

448-
static struct attribute_group ntrig_attribute_group = {
448+
static const struct attribute_group ntrig_attribute_group = {
449449
.attrs = sysfs_attrs
450450
};
451451

drivers/hid/hid-sensor-custom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static struct attribute *enable_sensor_attrs[] = {
276276
NULL,
277277
};
278278

279-
static struct attribute_group enable_sensor_attr_group = {
279+
static const struct attribute_group enable_sensor_attr_group = {
280280
.attrs = enable_sensor_attrs,
281281
};
282282

0 commit comments

Comments
 (0)