Commit 82a18fc3 authored by Jiri Kosina's avatar Jiri Kosina

Merge branch 'for-6.8/hid-bus-type-const' into for-linus

- bus_type constification (Greg Kroah-Hartman)
parents 39e7facb 9b0a3839
...@@ -2749,7 +2749,7 @@ static int hid_uevent(const struct device *dev, struct kobj_uevent_env *env) ...@@ -2749,7 +2749,7 @@ static int hid_uevent(const struct device *dev, struct kobj_uevent_env *env)
return 0; return 0;
} }
struct bus_type hid_bus_type = { const struct bus_type hid_bus_type = {
.name = "hid", .name = "hid",
.dev_groups = hid_dev_groups, .dev_groups = hid_dev_groups,
.drv_groups = hid_drv_groups, .drv_groups = hid_drv_groups,
......
...@@ -378,7 +378,7 @@ static const struct dev_pm_ops ishtp_cl_bus_dev_pm_ops = { ...@@ -378,7 +378,7 @@ static const struct dev_pm_ops ishtp_cl_bus_dev_pm_ops = {
.restore = ishtp_cl_device_resume, .restore = ishtp_cl_device_resume,
}; };
static struct bus_type ishtp_cl_bus_type = { static const struct bus_type ishtp_cl_bus_type = {
.name = "ishtp", .name = "ishtp",
.dev_groups = ishtp_cl_dev_groups, .dev_groups = ishtp_cl_dev_groups,
.probe = ishtp_cl_device_probe, .probe = ishtp_cl_device_probe,
......
...@@ -912,7 +912,7 @@ extern bool hid_ignore(struct hid_device *); ...@@ -912,7 +912,7 @@ extern bool hid_ignore(struct hid_device *);
extern int hid_add_device(struct hid_device *); extern int hid_add_device(struct hid_device *);
extern void hid_destroy_device(struct hid_device *); extern void hid_destroy_device(struct hid_device *);
extern struct bus_type hid_bus_type; extern const struct bus_type hid_bus_type;
extern int __must_check __hid_register_driver(struct hid_driver *, extern int __must_check __hid_register_driver(struct hid_driver *,
struct module *, const char *mod_name); struct module *, const char *mod_name);
......
...@@ -115,7 +115,7 @@ struct hid_bpf_ops { ...@@ -115,7 +115,7 @@ struct hid_bpf_ops {
size_t len, enum hid_report_type rtype, size_t len, enum hid_report_type rtype,
enum hid_class_request reqtype); enum hid_class_request reqtype);
struct module *owner; struct module *owner;
struct bus_type *bus_type; const struct bus_type *bus_type;
}; };
extern struct hid_bpf_ops *hid_bpf_ops; extern struct hid_bpf_ops *hid_bpf_ops;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment