diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-23 21:31:45 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-04-23 21:31:45 -0700 |
commit | 84e79a7f63e8caeac0c1a0817408860875a9b23e (patch) | |
tree | 0edfdb1f780f6e00f678b59a8f3fbff414b8072d | |
parent | 7732ce06ed8a0757b558665e8b37c29495585ce3 (diff) | |
parent | e6faf2b750ebf3837a63ebe465e7b7933502bdc4 (diff) | |
download | linux-stable-84e79a7f63e8caeac0c1a0817408860875a9b23e.tar.gz linux-stable-84e79a7f63e8caeac0c1a0817408860875a9b23e.tar.bz2 linux-stable-84e79a7f63e8caeac0c1a0817408860875a9b23e.zip |
Merge tag 'peci-next-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/iwi/linux into char-misc-next
Iwona writes:
Update peci-next for v6.10-rc1
- Move peci_bus_type, peci_controller_type and peci_device_type to be
constant.
-rw-r--r-- | drivers/peci/core.c | 4 | ||||
-rw-r--r-- | drivers/peci/device.c | 2 | ||||
-rw-r--r-- | drivers/peci/internal.h | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/drivers/peci/core.c b/drivers/peci/core.c index 0f83a9c6093b..8f8bda2f2a62 100644 --- a/drivers/peci/core.c +++ b/drivers/peci/core.c @@ -25,7 +25,7 @@ static void peci_controller_dev_release(struct device *dev) kfree(controller); } -struct device_type peci_controller_type = { +const struct device_type peci_controller_type = { .release = peci_controller_dev_release, }; @@ -201,7 +201,7 @@ static void peci_bus_device_remove(struct device *dev) driver->remove(device); } -struct bus_type peci_bus_type = { +const struct bus_type peci_bus_type = { .name = "peci", .match = peci_bus_device_match, .probe = peci_bus_device_probe, diff --git a/drivers/peci/device.c b/drivers/peci/device.c index e6b0bffb14f4..ee01f03c29b7 100644 --- a/drivers/peci/device.c +++ b/drivers/peci/device.c @@ -246,7 +246,7 @@ static void peci_device_release(struct device *dev) kfree(device); } -struct device_type peci_device_type = { +const struct device_type peci_device_type = { .groups = peci_device_groups, .release = peci_device_release, }; diff --git a/drivers/peci/internal.h b/drivers/peci/internal.h index 9d75ea54504c..506bafcccbbf 100644 --- a/drivers/peci/internal.h +++ b/drivers/peci/internal.h @@ -75,13 +75,13 @@ struct peci_device_id { u8 model; }; -extern struct device_type peci_device_type; +extern const struct device_type peci_device_type; extern const struct attribute_group *peci_device_groups[]; int peci_device_create(struct peci_controller *controller, u8 addr); void peci_device_destroy(struct peci_device *device); -extern struct bus_type peci_bus_type; +extern const struct bus_type peci_bus_type; extern const struct attribute_group *peci_bus_groups[]; /** @@ -129,7 +129,7 @@ void peci_driver_unregister(struct peci_driver *driver); #define module_peci_driver(__peci_driver) \ module_driver(__peci_driver, peci_driver_register, peci_driver_unregister) -extern struct device_type peci_controller_type; +extern const struct device_type peci_controller_type; int peci_controller_scan_devices(struct peci_controller *controller); |