Now that the driver core can properly handle constant struct bus_type,
move the nubus_bus_type variable to be a constant structure as well,
placing it into read-only memory which can not be modified at runtime.
It's also never used outside of drivers/nubus/bus.c so make it static
and don't export it as no one is using it.
Cc: Finn Thain <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/nubus/bus.c | 3 +--
include/linux/nubus.h | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/nubus/bus.c b/drivers/nubus/bus.c
index 72921e4f35f6..12df4d88970c 100644
--- a/drivers/nubus/bus.c
+++ b/drivers/nubus/bus.c
@@ -32,12 +32,11 @@ static void nubus_device_remove(struct device *dev)
ndrv->remove(to_nubus_board(dev));
}
-struct bus_type nubus_bus_type = {
+static const struct bus_type nubus_bus_type = {
.name = "nubus",
.probe = nubus_device_probe,
.remove = nubus_device_remove,
};
-EXPORT_SYMBOL(nubus_bus_type);
int nubus_driver_register(struct nubus_driver *ndrv)
{
diff --git a/include/linux/nubus.h b/include/linux/nubus.h
index bdcd85e622d8..4d103ac8f5c7 100644
--- a/include/linux/nubus.h
+++ b/include/linux/nubus.h
@@ -89,8 +89,6 @@ struct nubus_driver {
void (*remove)(struct nubus_board *board);
};
-extern struct bus_type nubus_bus_type;
-
/* Generic NuBus interface functions, modelled after the PCI interface */
#ifdef CONFIG_PROC_FS
extern bool nubus_populate_procfs;
--
2.43.0
On Tue, 19 Dec 2023, Greg Kroah-Hartman wrote:
> Now that the driver core can properly handle constant struct bus_type,
> move the nubus_bus_type variable to be a constant structure as well,
> placing it into read-only memory which can not be modified at runtime.
>
> It's also never used outside of drivers/nubus/bus.c so make it static
> and don't export it as no one is using it.
>
> Cc: Finn Thain <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Acked-by: Finn Thain <[email protected]>
Thanks, Greg.
> ---
> drivers/nubus/bus.c | 3 +--
> include/linux/nubus.h | 2 --
> 2 files changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/nubus/bus.c b/drivers/nubus/bus.c
> index 72921e4f35f6..12df4d88970c 100644
> --- a/drivers/nubus/bus.c
> +++ b/drivers/nubus/bus.c
> @@ -32,12 +32,11 @@ static void nubus_device_remove(struct device *dev)
> ndrv->remove(to_nubus_board(dev));
> }
>
> -struct bus_type nubus_bus_type = {
> +static const struct bus_type nubus_bus_type = {
> .name = "nubus",
> .probe = nubus_device_probe,
> .remove = nubus_device_remove,
> };
> -EXPORT_SYMBOL(nubus_bus_type);
>
> int nubus_driver_register(struct nubus_driver *ndrv)
> {
> diff --git a/include/linux/nubus.h b/include/linux/nubus.h
> index bdcd85e622d8..4d103ac8f5c7 100644
> --- a/include/linux/nubus.h
> +++ b/include/linux/nubus.h
> @@ -89,8 +89,6 @@ struct nubus_driver {
> void (*remove)(struct nubus_board *board);
> };
>
> -extern struct bus_type nubus_bus_type;
> -
> /* Generic NuBus interface functions, modelled after the PCI interface */
> #ifdef CONFIG_PROC_FS
> extern bool nubus_populate_procfs;
>
On Tue, Dec 19, 2023 at 4:48 PM Greg Kroah-Hartman
<[email protected]> wrote:
> Now that the driver core can properly handle constant struct bus_type,
> move the nubus_bus_type variable to be a constant structure as well,
> placing it into read-only memory which can not be modified at runtime.
>
> It's also never used outside of drivers/nubus/bus.c so make it static
> and don't export it as no one is using it.
>
> Cc: Finn Thain <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Reviewed-by: Geert Uytterhoeven <[email protected]>
i.e. will queue in the m68k for-v6.8 branch.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Tue, Jan 02, 2024 at 09:16:23AM +0100, Geert Uytterhoeven wrote:
> On Tue, Dec 19, 2023 at 4:48 PM Greg Kroah-Hartman
> <[email protected]> wrote:
> > Now that the driver core can properly handle constant struct bus_type,
> > move the nubus_bus_type variable to be a constant structure as well,
> > placing it into read-only memory which can not be modified at runtime.
> >
> > It's also never used outside of drivers/nubus/bus.c so make it static
> > and don't export it as no one is using it.
> >
> > Cc: Finn Thain <[email protected]>
> > Cc: [email protected]
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> Reviewed-by: Geert Uytterhoeven <[email protected]>
> i.e. will queue in the m68k for-v6.8 branch.
Thanks!