Merge tag 'sunxi-drivers-for-6.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/drivers

arndb · arndb · commit c6274c15f9cd · 2024-03-04T16:51:58.000+01:00
- make sunxi_rsb_bus constant * tag 'sunxi-drivers-for-6.9-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: bus: sunxi-rsb: make sunxi_rsb_bus const Link: https://lore.kernel.org/r/20240223205734.GA9027@jernej-laptop Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c
@@ -128,7 +128,7 @@ struct sunxi_rsb {
 };
 
 /* bus / slave device related functions */
-static struct bus_type sunxi_rsb_bus;
+static const struct bus_type sunxi_rsb_bus;
 
 static int sunxi_rsb_device_match(struct device *dev, struct device_driver *drv)
 {
@@ -177,7 +177,7 @@ static int sunxi_rsb_device_modalias(const struct device *dev, struct kobj_ueven
 	return of_device_uevent_modalias(dev, env);
 }
 
-static struct bus_type sunxi_rsb_bus = {
+static const struct bus_type sunxi_rsb_bus = {
 	.name		= RSB_CTRL_NAME,
 	.match		= sunxi_rsb_device_match,
 	.probe		= sunxi_rsb_device_probe,

Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ struct sunxi_rsb {`
`128`	`128`	`};`
`129`	`129`
`130`	`130`	`/* bus / slave device related functions */`
`131`		`-static struct bus_type sunxi_rsb_bus;`
	`131`	`+static const struct bus_type sunxi_rsb_bus;`
`132`	`132`
`133`	`133`	`static int sunxi_rsb_device_match(struct device dev, struct device_driver drv)`
`134`	`134`	`{`
`@@ -177,7 +177,7 @@ static int sunxi_rsb_device_modalias(const struct device *dev, struct kobj_ueven`
`177`	`177`	`return of_device_uevent_modalias(dev, env);`
`178`	`178`	`}`
`179`	`179`
`180`		`-static struct bus_type sunxi_rsb_bus = {`
	`180`	`+static const struct bus_type sunxi_rsb_bus = {`
`181`	`181`	`.name = RSB_CTRL_NAME,`
`182`	`182`	`.match = sunxi_rsb_device_match,`
`183`	`183`	`.probe = sunxi_rsb_device_probe,`