2024-01-05 12:51:34

by Greg Kroah-Hartman

Subject: [PATCH] PNP: make pnp_bus_type const

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

Cc: "Rafael J. Wysocki" <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/pnp/driver.c | 2 +-
include/linux/pnp.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
index 46c534f6b1c9..0a5d0d8befa8 100644
--- a/drivers/pnp/driver.c
+++ b/drivers/pnp/driver.c
@@ -256,7 +256,7 @@ static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
.restore = pnp_bus_resume,
};

-struct bus_type pnp_bus_type = {
+const struct bus_type pnp_bus_type = {
.name = "pnp",
.match = pnp_bus_match,
.probe = pnp_device_probe,
diff --git a/include/linux/pnp.h b/include/linux/pnp.h
index 267fb8a4fb6e..ddbe7c3ca4ce 100644
--- a/include/linux/pnp.h
+++ b/include/linux/pnp.h
@@ -435,7 +435,7 @@ struct pnp_protocol {
#define protocol_for_each_dev(protocol, dev) \
list_for_each_entry(dev, &(protocol)->devices, protocol_list)

-extern struct bus_type pnp_bus_type;
+extern const struct bus_type pnp_bus_type;

#if defined(CONFIG_PNP)

--
2.43.0

2024-01-09 14:03:08

by Rafael J. Wysocki

Subject: Re: [PATCH] PNP: make pnp_bus_type const

On Fri, Jan 5, 2024 at 1:51 PM Greg Kroah-Hartman
<[email protected]> wrote:
>
> Now that the driver core can properly handle constant struct bus_type,
> move the pnp_bus_type variable to be a constant structure as well,
> placing it into read-only memory which can not be modified at runtime.
>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
> drivers/pnp/driver.c | 2 +-
> include/linux/pnp.h | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c
> index 46c534f6b1c9..0a5d0d8befa8 100644
> --- a/drivers/pnp/driver.c
> +++ b/drivers/pnp/driver.c
> @@ -256,7 +256,7 @@ static const struct dev_pm_ops pnp_bus_dev_pm_ops = {
> .restore = pnp_bus_resume,
> };
>
> -struct bus_type pnp_bus_type = {
> +const struct bus_type pnp_bus_type = {
> .name = "pnp",
> .match = pnp_bus_match,
> .probe = pnp_device_probe,
> diff --git a/include/linux/pnp.h b/include/linux/pnp.h
> index 267fb8a4fb6e..ddbe7c3ca4ce 100644
> --- a/include/linux/pnp.h
> +++ b/include/linux/pnp.h
> @@ -435,7 +435,7 @@ struct pnp_protocol {
> #define protocol_for_each_dev(protocol, dev) \
> list_for_each_entry(dev, &(protocol)->devices, protocol_list)
>
> -extern struct bus_type pnp_bus_type;
> +extern const struct bus_type pnp_bus_type;
>
> #if defined(CONFIG_PNP)
>
> --

Applied as 6.8-rc1 material, thanks!