Skip to content

Commit 82a18fc

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.8/hid-bus-type-const' into for-linus
- bus_type constification (Greg Kroah-Hartman)
2 parents 39e7fac + 9b0a383 commit 82a18fc

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

drivers/hid/hid-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2749,7 +2749,7 @@ static int hid_uevent(const struct device *dev, struct kobj_uevent_env *env)
27492749
return 0;
27502750
}
27512751

2752-
struct bus_type hid_bus_type = {
2752+
const struct bus_type hid_bus_type = {
27532753
.name = "hid",
27542754
.dev_groups = hid_dev_groups,
27552755
.drv_groups = hid_drv_groups,

drivers/hid/intel-ish-hid/ishtp/bus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ static const struct dev_pm_ops ishtp_cl_bus_dev_pm_ops = {
378378
.restore = ishtp_cl_device_resume,
379379
};
380380

381-
static struct bus_type ishtp_cl_bus_type = {
381+
static const struct bus_type ishtp_cl_bus_type = {
382382
.name = "ishtp",
383383
.dev_groups = ishtp_cl_dev_groups,
384384
.probe = ishtp_cl_device_probe,

include/linux/hid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -912,7 +912,7 @@ extern bool hid_ignore(struct hid_device *);
912912
extern int hid_add_device(struct hid_device *);
913913
extern void hid_destroy_device(struct hid_device *);
914914

915-
extern struct bus_type hid_bus_type;
915+
extern const struct bus_type hid_bus_type;
916916

917917
extern int __must_check __hid_register_driver(struct hid_driver *,
918918
struct module *, const char *mod_name);

include/linux/hid_bpf.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ struct hid_bpf_ops {
115115
size_t len, enum hid_report_type rtype,
116116
enum hid_class_request reqtype);
117117
struct module *owner;
118-
struct bus_type *bus_type;
118+
const struct bus_type *bus_type;
119119
};
120120

121121
extern struct hid_bpf_ops *hid_bpf_ops;

0 commit comments

Comments
 (0)