Commit 94959c0e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Wolfram Sang

i2c: make i2c_bus_type const

Now that the driver core can properly handle constant struct bus_type,
move the i2c_bus_type variable to be a constant structure as well, placing
it into read-only memory which can not be modified at runtime.

Note, the sound/soc/rockchip/rk3399_gru_sound.c also needed tweaking as
it decided to save off a pointer to a bus type for internal stuff, and
it was using the i2c_bus_type as well.
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 614ef4d3
...@@ -692,7 +692,7 @@ static struct attribute *i2c_dev_attrs[] = { ...@@ -692,7 +692,7 @@ static struct attribute *i2c_dev_attrs[] = {
}; };
ATTRIBUTE_GROUPS(i2c_dev); ATTRIBUTE_GROUPS(i2c_dev);
struct bus_type i2c_bus_type = { const struct bus_type i2c_bus_type = {
.name = "i2c", .name = "i2c",
.match = i2c_device_match, .match = i2c_device_match,
.probe = i2c_device_probe, .probe = i2c_device_probe,
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <linux/swab.h> /* for swab16 */ #include <linux/swab.h> /* for swab16 */
#include <uapi/linux/i2c.h> #include <uapi/linux/i2c.h>
extern struct bus_type i2c_bus_type; extern const struct bus_type i2c_bus_type;
extern struct device_type i2c_adapter_type; extern struct device_type i2c_adapter_type;
extern struct device_type i2c_client_type; extern struct device_type i2c_client_type;
......
...@@ -446,7 +446,7 @@ static const struct rockchip_sound_route rockchip_routes[] = { ...@@ -446,7 +446,7 @@ static const struct rockchip_sound_route rockchip_routes[] = {
struct dailink_match_data { struct dailink_match_data {
const char *compatible; const char *compatible;
struct bus_type *bus_type; const struct bus_type *bus_type;
}; };
static const struct dailink_match_data dailink_match[] = { static const struct dailink_match_data dailink_match[] = {
......
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