driver core: make driver_[create|remove]_file take a const *
Greg Kroah-Hartman
maintainerPATCH 1/3 driver core: make driver_[create|remove]_file take a const *
The functions driver_create_file() and driver_remove_file() do not modify the struct device_driver structure directly, so they are safe to be marked as a constant pointer type.
--- drivers/base/driver.c | 4 ++-- include/linux/device/driver.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
drivers/base/driver.c +2 -2
@@ -173,7 +173,7 @@ EXPORT_SYMBOL_GPL(driver_find_device);* @drv: driver. * @attr: driver attribute descriptor. */ -int driver_create_file (struct device_driver *drv, +int driver_create_file (const struct device_driver *drv,const struct driver_attribute *attr) {int error;
@@ -191,7 +191,7 @@ EXPORT_SYMBOL_GPL(driver_create_file);* @drv: driver. * @attr: driver attribute descriptor. */ -void driver_remove_file (struct device_driver *drv, +void driver_remove_file (const struct device_driver *drv,const struct driver_attribute *attr) {if (drv)
include/linux/device/driver.h +2 -2
@@ -146,9 +146,9 @@ struct driver_attribute {#define DRIVER_ATTR_WO (_name) \ struct driver_attribute driver_attr_##_name = __ATTR_WO(_name) -int __must_check driver_create_file (struct device_driver *driver, +int __must_check driver_create_file (const struct device_driver *driver,const struct driver_attribute *attr); -void driver_remove_file (struct device_driver *driver, +void driver_remove_file (const struct device_driver *driver,const struct driver_attribute *attr); int driver_set_override(struct device *dev, const char **override,
base-commit: 997197b58bf6e22b8c6ef88a168d8292fa9acec9
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 2/3 driver core: make driver_find_device() take a const *
The function driver_find_device() does not modify the struct device_driver structure directly, so it is safe to be marked as a constant pointer type. As that is fixed up, also change the function signature on the inline functions that call this, which are:
driver_find_device_by_name() driver_find_device_by_of_node() driver_find_device_by_devt() driver_find_next_device() driver_find_device_by_acpi_dev()
--- drivers/base/driver.c | 2 +- include/linux/device/driver.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/base/driver.c +1 -1
@@ -148,7 +148,7 @@ EXPORT_SYMBOL_GPL(driver_for_each_device);* if it does. If the callback returns non-zero, this function will * return to the caller and not iterate over any more devices. */ -struct device *driver_find_device (struct device_driver *drv, +struct device *driver_find_device (const struct device_driver *drv,struct device *start,const void *data,int (*match)(struct device *dev,const void *data)) {
include/linux/device/driver.h +7 -7
@@ -155,7 +155,7 @@ int driver_set_override(struct device *dev, const char **override, const char *s, size_t len);int __must_check driver_for_each_device (struct device_driver *drv,struct device *start,void *data,int (*fn)(struct device *dev,void *)); -struct device *driver_find_device (struct device_driver *drv, +struct device *driver_find_device (const struct device_driver *drv,struct device *start,const void *data,int (*match)(struct device *dev,const void *data));
@@ -165,7 +165,7 @@ struct device *driver_find_device(struct device_driver *drv,* @drv: the driver we're iterating * @name: name of the device to match */ -static inline struct device *driver_find_device_by_name (struct device_driver *drv, +static inline struct device *driver_find_device_by_name (const struct device_driver *drv,const char *name) {return driver_find_device (drv,NULL , name, device_match_name);
@@ -178,7 +178,7 @@ static inline struct device *driver_find_device_by_name(struct device_driver *dr* @np: of_node pointer to match. */ static inline struct device * -driver_find_device_by_of_node (struct device_driver *drv, +driver_find_device_by_of_node (const struct device_driver *drv,const struct device_node *np) {return driver_find_device (drv,NULL , np, device_match_of_node);
@@ -203,13 +203,13 @@ driver_find_device_by_fwnode(struct device_driver *drv,* @drv: the driver we're iterating * @devt: devt pointer to match. */ -static inline struct device *driver_find_device_by_devt (struct device_driver *drv, +static inline struct device *driver_find_device_by_devt (const struct device_driver *drv,dev_t devt) {return driver_find_device (drv,NULL , &devt, device_match_devt); } -static inline struct device *driver_find_next_device (struct device_driver *drv, +static inline struct device *driver_find_next_device (const struct device_driver *drv,struct device *start) {return driver_find_device (drv, start,NULL , device_match_any);
@@ -223,14 +223,14 @@ static inline struct device *driver_find_next_device(struct device_driver *drv,* @adev: ACPI_COMPANION device to match. */ static inline struct device * -driver_find_device_by_acpi_dev (struct device_driver *drv, +driver_find_device_by_acpi_dev (const struct device_driver *drv,const struct acpi_device *adev) {return driver_find_device (drv,NULL , adev, device_match_acpi_dev); }#else static inline struct device * -driver_find_device_by_acpi_dev (struct device_driver *drv,const void *adev) +driver_find_device_by_acpi_dev (const struct device_driver *drv,const void *adev) {return NULL ; }
Signature · 1 line
2.45.2
Greg Kroah-Hartman
maintainerPATCH 3/3 driver core: module: make module_[add|remove]_driver take a const *
In reply to Greg Kroah-HartmanThe functions module_add_driver() and module_remove_driver() do not modify the struct device_driver structure directly, so they are safe to be marked as a constant pointer type.
--- drivers/base/base.h | 4 ++-- drivers/base/module.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/base/base.h +2 -2
@@ -192,8 +192,8 @@ extern struct kset *devices_kset;void devices_kset_move_last (struct device *dev);#if defined(CONFIG_MODULES ) && defined(CONFIG_SYSFS ) -int module_add_driver (struct module *mod,struct device_driver *drv); -void module_remove_driver (struct device_driver *drv); +int module_add_driver (struct module *mod,const struct device_driver *drv); +void module_remove_driver (const struct device_driver *drv);#else static inline int module_add_driver (struct module *mod,struct device_driver *drv)
drivers/base/module.c +3 -3
@@ -9,7 +9,7 @@#include <linux/string.h> #include "base.h" -static char *make_driver_name (struct device_driver *drv) +static char *make_driver_name (const struct device_driver *drv) {char *driver_name;
@@ -30,7 +30,7 @@ static void module_create_drivers_dir(struct module_kobject *mk)mutex_unlock (&drivers_dir_mutex); } -int module_add_driver (struct module *mod,struct device_driver *drv) +int module_add_driver (struct module *mod,const struct device_driver *drv) {char *driver_name;struct module_kobject *mk =NULL ;
@@ -89,7 +89,7 @@ int module_add_driver(struct module *mod, struct device_driver *drv)return ret; } -void module_remove_driver (struct device_driver *drv) +void module_remove_driver (const struct device_driver *drv) {struct module_kobject *mk =NULL ;char *driver_name;
Signature · 1 line
2.45.2