microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

device property: make device_property functions take const device * 

device_property functions do not modify the device pointer passed to them.
The underlying of_device and fwnode_ functions actually already take
const * arguments. Mark the parameter constant to simplify conversion
from of_property to device_property functions, and to let the calling code
use const device pointers where possible.

Cc: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230419164127.3773278-1-linux@roeck-us.net
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Guenter Roeck 2023-04-19 09:41:27 -07:00 коммит произвёл Greg Kroah-Hartman
Родитель 11a9670394
Коммит 046b6a1710
2 изменённых файлов: 26 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
drivers/base/property.c
Просмотреть файл

@ -40,7 +40,7 @@ EXPORT_SYMBOL_GPL(__dev_fwnode_const);
* *
* Return: true if property @propname is present. Otherwise, returns false. * Return: true if property @propname is present. Otherwise, returns false.
*/ */
bool device_property_present(struct device *dev, const char *propname) bool device_property_present(const struct device *dev, const char *propname)
{ {
return fwnode_property_present(dev_fwnode(dev), propname); return fwnode_property_present(dev_fwnode(dev), propname);
} }
@ -90,7 +90,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_present);
* %-EOVERFLOW if the size of the property is not as expected. * %-EOVERFLOW if the size of the property is not as expected.
* %-ENXIO if no suitable firmware interface is present. * %-ENXIO if no suitable firmware interface is present.
*/ */
int device_property_read_u8_array(struct device *dev, const char *propname, int device_property_read_u8_array(const struct device *dev, const char *propname,
u8 *val, size_t nval) u8 *val, size_t nval)
{ {
return fwnode_property_read_u8_array(dev_fwnode(dev), propname, val, nval); return fwnode_property_read_u8_array(dev_fwnode(dev), propname, val, nval);
@ -118,7 +118,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u8_array);
* %-EOVERFLOW if the size of the property is not as expected. * %-EOVERFLOW if the size of the property is not as expected.
* %-ENXIO if no suitable firmware interface is present. * %-ENXIO if no suitable firmware interface is present.
*/ */
int device_property_read_u16_array(struct device *dev, const char *propname, int device_property_read_u16_array(const struct device *dev, const char *propname,
u16 *val, size_t nval) u16 *val, size_t nval)
{ {
return fwnode_property_read_u16_array(dev_fwnode(dev), propname, val, nval); return fwnode_property_read_u16_array(dev_fwnode(dev), propname, val, nval);
@ -146,7 +146,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u16_array);
* %-EOVERFLOW if the size of the property is not as expected. * %-EOVERFLOW if the size of the property is not as expected.
* %-ENXIO if no suitable firmware interface is present. * %-ENXIO if no suitable firmware interface is present.
*/ */
int device_property_read_u32_array(struct device *dev, const char *propname, int device_property_read_u32_array(const struct device *dev, const char *propname,
u32 *val, size_t nval) u32 *val, size_t nval)
{ {
return fwnode_property_read_u32_array(dev_fwnode(dev), propname, val, nval); return fwnode_property_read_u32_array(dev_fwnode(dev), propname, val, nval);
@ -174,7 +174,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u32_array);
* %-EOVERFLOW if the size of the property is not as expected. * %-EOVERFLOW if the size of the property is not as expected.
* %-ENXIO if no suitable firmware interface is present. * %-ENXIO if no suitable firmware interface is present.
*/ */
int device_property_read_u64_array(struct device *dev, const char *propname, int device_property_read_u64_array(const struct device *dev, const char *propname,
u64 *val, size_t nval) u64 *val, size_t nval)
{ {
return fwnode_property_read_u64_array(dev_fwnode(dev), propname, val, nval); return fwnode_property_read_u64_array(dev_fwnode(dev), propname, val, nval);
@ -202,7 +202,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u64_array);
* %-EOVERFLOW if the size of the property is not as expected. * %-EOVERFLOW if the size of the property is not as expected.
* %-ENXIO if no suitable firmware interface is present. * %-ENXIO if no suitable firmware interface is present.
*/ */
int device_property_read_string_array(struct device *dev, const char *propname, int device_property_read_string_array(const struct device *dev, const char *propname,
const char **val, size_t nval) const char **val, size_t nval)
{ {
return fwnode_property_read_string_array(dev_fwnode(dev), propname, val, nval); return fwnode_property_read_string_array(dev_fwnode(dev), propname, val, nval);
@ -224,7 +224,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string_array);
* %-EPROTO or %-EILSEQ if the property type is not a string. * %-EPROTO or %-EILSEQ if the property type is not a string.
* %-ENXIO if no suitable firmware interface is present. * %-ENXIO if no suitable firmware interface is present.
*/ */
int device_property_read_string(struct device *dev, const char *propname, int device_property_read_string(const struct device *dev, const char *propname,
const char **val) const char **val)
{ {
return fwnode_property_read_string(dev_fwnode(dev), propname, val); return fwnode_property_read_string(dev_fwnode(dev), propname, val);
@ -246,7 +246,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string);
* %-EPROTO if the property is not an array of strings, * %-EPROTO if the property is not an array of strings,
* %-ENXIO if no suitable firmware interface is present. * %-ENXIO if no suitable firmware interface is present.
*/ */
int device_property_match_string(struct device *dev, const char *propname, int device_property_match_string(const struct device *dev, const char *propname,
const char *string) const char *string)
{ {
return fwnode_property_match_string(dev_fwnode(dev), propname, string); return fwnode_property_match_string(dev_fwnode(dev), propname, string);

36
include/linux/property.h
Просмотреть файл

@ -39,20 +39,20 @@ struct fwnode_handle *__dev_fwnode(struct device *dev);
const struct device *: __dev_fwnode_const, \ const struct device *: __dev_fwnode_const, \
struct device *: __dev_fwnode)(dev) struct device *: __dev_fwnode)(dev)
bool device_property_present(struct device *dev, const char *propname); bool device_property_present(const struct device *dev, const char *propname);
int device_property_read_u8_array(struct device *dev, const char *propname, int device_property_read_u8_array(const struct device *dev, const char *propname,
u8 *val, size_t nval); u8 *val, size_t nval);
int device_property_read_u16_array(struct device *dev, const char *propname, int device_property_read_u16_array(const struct device *dev, const char *propname,
u16 *val, size_t nval); u16 *val, size_t nval);
int device_property_read_u32_array(struct device *dev, const char *propname, int device_property_read_u32_array(const struct device *dev, const char *propname,
u32 *val, size_t nval); u32 *val, size_t nval);
int device_property_read_u64_array(struct device *dev, const char *propname, int device_property_read_u64_array(const struct device *dev, const char *propname,
u64 *val, size_t nval); u64 *val, size_t nval);
int device_property_read_string_array(struct device *dev, const char *propname, int device_property_read_string_array(const struct device *dev, const char *propname,
const char **val, size_t nval); const char **val, size_t nval);
int device_property_read_string(struct device *dev, const char *propname, int device_property_read_string(const struct device *dev, const char *propname,
const char **val); const char **val);
int device_property_match_string(struct device *dev, int device_property_match_string(const struct device *dev,
const char *propname, const char *string); const char *propname, const char *string);
bool fwnode_property_present(const struct fwnode_handle *fwnode, bool fwnode_property_present(const struct fwnode_handle *fwnode,
@ -142,57 +142,57 @@ int fwnode_irq_get_byname(const struct fwnode_handle *fwnode, const char *name);
unsigned int device_get_child_node_count(const struct device *dev); unsigned int device_get_child_node_count(const struct device *dev);
static inline bool device_property_read_bool(struct device *dev, static inline bool device_property_read_bool(const struct device *dev,
const char *propname) const char *propname)
{ {
return device_property_present(dev, propname); return device_property_present(dev, propname);
} }
static inline int device_property_read_u8(struct device *dev, static inline int device_property_read_u8(const struct device *dev,
const char *propname, u8 *val) const char *propname, u8 *val)
{ {
return device_property_read_u8_array(dev, propname, val, 1); return device_property_read_u8_array(dev, propname, val, 1);
} }
static inline int device_property_read_u16(struct device *dev, static inline int device_property_read_u16(const struct device *dev,
const char *propname, u16 *val) const char *propname, u16 *val)
{ {
return device_property_read_u16_array(dev, propname, val, 1); return device_property_read_u16_array(dev, propname, val, 1);
} }
static inline int device_property_read_u32(struct device *dev, static inline int device_property_read_u32(const struct device *dev,
const char *propname, u32 *val) const char *propname, u32 *val)
{ {
return device_property_read_u32_array(dev, propname, val, 1); return device_property_read_u32_array(dev, propname, val, 1);
} }
static inline int device_property_read_u64(struct device *dev, static inline int device_property_read_u64(const struct device *dev,
const char *propname, u64 *val) const char *propname, u64 *val)
{ {
return device_property_read_u64_array(dev, propname, val, 1); return device_property_read_u64_array(dev, propname, val, 1);
} }
static inline int device_property_count_u8(struct device *dev, const char *propname) static inline int device_property_count_u8(const struct device *dev, const char *propname)
{ {
return device_property_read_u8_array(dev, propname, NULL, 0); return device_property_read_u8_array(dev, propname, NULL, 0);
} }
static inline int device_property_count_u16(struct device *dev, const char *propname) static inline int device_property_count_u16(const struct device *dev, const char *propname)
{ {
return device_property_read_u16_array(dev, propname, NULL, 0); return device_property_read_u16_array(dev, propname, NULL, 0);
} }
static inline int device_property_count_u32(struct device *dev, const char *propname) static inline int device_property_count_u32(const struct device *dev, const char *propname)
{ {
return device_property_read_u32_array(dev, propname, NULL, 0); return device_property_read_u32_array(dev, propname, NULL, 0);
} }
static inline int device_property_count_u64(struct device *dev, const char *propname) static inline int device_property_count_u64(const struct device *dev, const char *propname)
{ {
return device_property_read_u64_array(dev, propname, NULL, 0); return device_property_read_u64_array(dev, propname, NULL, 0);
} }
static inline int device_property_string_array_count(struct device *dev, static inline int device_property_string_array_count(const struct device *dev,
const char *propname) const char *propname)
{ {
return device_property_read_string_array(dev, propname, NULL, 0); return device_property_read_string_array(dev, propname, NULL, 0);