diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-19 16:47:41 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2024-01-03 13:33:59 +0100 |
| commit | a15f2d48c6f84ae0dd2000288592c79d5d1acd0e (patch) | |
| tree | 1919f6621f4016c3e2bd4c002d77378270f016f3 | |
| parent | b85ea95d086471afb4ad062012a4d73cd328fa86 (diff) | |
| download | misc-a15f2d48c6f84ae0dd2000288592c79d5d1acd0e.tar.gz | |
nubus: Make nubus_bus_type static and constant
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.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Finn Thain <fthain@linux-m68k.org>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/2023121940-enlarged-editor-c9a8@gregkh
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
| -rw-r--r-- | drivers/nubus/bus.c | 3 | ||||
| -rw-r--r-- | include/linux/nubus.h | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/nubus/bus.c b/drivers/nubus/bus.c index 72921e4f35f6e..12df4d88970c8 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 bdcd85e622d80..4d103ac8f5c7a 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; |