mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 10:32:35 +00:00
device property: allow to constify properties
There is no reason why statically defined properties should be modifiable, so let's make device_add_properties() and the rest of pset_*() functions to take const pointers to properties. This will allow us to mark properties as const/__initconst at definition sites. Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
d5adbfcd5f
commit
bec84da8d1
@ -21,7 +21,7 @@
|
||||
|
||||
struct property_set {
|
||||
struct fwnode_handle fwnode;
|
||||
struct property_entry *properties;
|
||||
const struct property_entry *properties;
|
||||
};
|
||||
|
||||
static inline bool is_pset_node(struct fwnode_handle *fwnode)
|
||||
@ -35,10 +35,10 @@ static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)
|
||||
container_of(fwnode, struct property_set, fwnode) : NULL;
|
||||
}
|
||||
|
||||
static struct property_entry *pset_prop_get(struct property_set *pset,
|
||||
const char *name)
|
||||
static const struct property_entry *pset_prop_get(struct property_set *pset,
|
||||
const char *name)
|
||||
{
|
||||
struct property_entry *prop;
|
||||
const struct property_entry *prop;
|
||||
|
||||
if (!pset || !pset->properties)
|
||||
return NULL;
|
||||
@ -50,11 +50,11 @@ static struct property_entry *pset_prop_get(struct property_set *pset,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void *pset_prop_find(struct property_set *pset, const char *propname,
|
||||
size_t length)
|
||||
static const void *pset_prop_find(struct property_set *pset,
|
||||
const char *propname, size_t length)
|
||||
{
|
||||
struct property_entry *prop;
|
||||
void *pointer;
|
||||
const struct property_entry *prop;
|
||||
const void *pointer;
|
||||
|
||||
prop = pset_prop_get(pset, propname);
|
||||
if (!prop)
|
||||
@ -74,7 +74,7 @@ static int pset_prop_read_u8_array(struct property_set *pset,
|
||||
const char *propname,
|
||||
u8 *values, size_t nval)
|
||||
{
|
||||
void *pointer;
|
||||
const void *pointer;
|
||||
size_t length = nval * sizeof(*values);
|
||||
|
||||
pointer = pset_prop_find(pset, propname, length);
|
||||
@ -89,7 +89,7 @@ static int pset_prop_read_u16_array(struct property_set *pset,
|
||||
const char *propname,
|
||||
u16 *values, size_t nval)
|
||||
{
|
||||
void *pointer;
|
||||
const void *pointer;
|
||||
size_t length = nval * sizeof(*values);
|
||||
|
||||
pointer = pset_prop_find(pset, propname, length);
|
||||
@ -104,7 +104,7 @@ static int pset_prop_read_u32_array(struct property_set *pset,
|
||||
const char *propname,
|
||||
u32 *values, size_t nval)
|
||||
{
|
||||
void *pointer;
|
||||
const void *pointer;
|
||||
size_t length = nval * sizeof(*values);
|
||||
|
||||
pointer = pset_prop_find(pset, propname, length);
|
||||
@ -119,7 +119,7 @@ static int pset_prop_read_u64_array(struct property_set *pset,
|
||||
const char *propname,
|
||||
u64 *values, size_t nval)
|
||||
{
|
||||
void *pointer;
|
||||
const void *pointer;
|
||||
size_t length = nval * sizeof(*values);
|
||||
|
||||
pointer = pset_prop_find(pset, propname, length);
|
||||
@ -133,7 +133,7 @@ static int pset_prop_read_u64_array(struct property_set *pset,
|
||||
static int pset_prop_count_elems_of_size(struct property_set *pset,
|
||||
const char *propname, size_t length)
|
||||
{
|
||||
struct property_entry *prop;
|
||||
const struct property_entry *prop;
|
||||
|
||||
prop = pset_prop_get(pset, propname);
|
||||
if (!prop)
|
||||
@ -146,7 +146,7 @@ static int pset_prop_read_string_array(struct property_set *pset,
|
||||
const char *propname,
|
||||
const char **strings, size_t nval)
|
||||
{
|
||||
void *pointer;
|
||||
const void *pointer;
|
||||
size_t length = nval * sizeof(*strings);
|
||||
|
||||
pointer = pset_prop_find(pset, propname, length);
|
||||
@ -160,8 +160,8 @@ static int pset_prop_read_string_array(struct property_set *pset,
|
||||
static int pset_prop_read_string(struct property_set *pset,
|
||||
const char *propname, const char **strings)
|
||||
{
|
||||
struct property_entry *prop;
|
||||
const char **pointer;
|
||||
const struct property_entry *prop;
|
||||
const char * const *pointer;
|
||||
|
||||
prop = pset_prop_get(pset, propname);
|
||||
if (!prop)
|
||||
@ -776,7 +776,7 @@ static int pset_copy_entry(struct property_entry *dst,
|
||||
*/
|
||||
static struct property_set *pset_copy_set(const struct property_set *pset)
|
||||
{
|
||||
const struct property_entry *entry;
|
||||
struct property_entry *props;
|
||||
struct property_set *p;
|
||||
size_t i, n = 0;
|
||||
|
||||
@ -787,14 +787,14 @@ static struct property_set *pset_copy_set(const struct property_set *pset)
|
||||
while (pset->properties[n].name)
|
||||
n++;
|
||||
|
||||
p->properties = kcalloc(n + 1, sizeof(*entry), GFP_KERNEL);
|
||||
p->properties = props = kcalloc(n + 1, sizeof(*props), GFP_KERNEL);
|
||||
if (!p->properties) {
|
||||
kfree(p);
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
int ret = pset_copy_entry(&p->properties[i],
|
||||
int ret = pset_copy_entry(&props[i],
|
||||
&pset->properties[i]);
|
||||
if (ret) {
|
||||
pset_free_set(p);
|
||||
@ -847,7 +847,8 @@ EXPORT_SYMBOL_GPL(device_remove_properties);
|
||||
* @dev as its secondary firmware node. The function takes a copy of
|
||||
* @properties.
|
||||
*/
|
||||
int device_add_properties(struct device *dev, struct property_entry *properties)
|
||||
int device_add_properties(struct device *dev,
|
||||
const struct property_entry *properties)
|
||||
{
|
||||
struct property_set *p, pset;
|
||||
|
||||
|
@ -242,7 +242,7 @@ struct property_entry {
|
||||
}
|
||||
|
||||
int device_add_properties(struct device *dev,
|
||||
struct property_entry *properties);
|
||||
const struct property_entry *properties);
|
||||
void device_remove_properties(struct device *dev);
|
||||
|
||||
bool device_dma_supported(struct device *dev);
|
||||
|
Loading…
Reference in New Issue
Block a user