Skip to content

Commit

Permalink
device property: Constify argument to pset fwnode backend
Browse files Browse the repository at this point in the history 
Internally constify pset fwnode backend. Do not touch the pset fwnode
operations yet.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
Sakari Ailus authored and Rafael J. Wysocki committed Jul 21, 2017
1 parent 99a8546 commit 39e5aee
Showing 1 changed file with 20 additions and 16 deletions.
36 changes: 20 additions & 16 deletions drivers/base/property.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,23 @@ struct property_set {

static const struct fwnode_operations pset_fwnode_ops;

static inline bool is_pset_node(struct fwnode_handle *fwnode)
static inline bool is_pset_node(const struct fwnode_handle *fwnode)
{
return !IS_ERR_OR_NULL(fwnode) && fwnode->ops == &pset_fwnode_ops;
}

static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)
{
return is_pset_node(fwnode) ?
container_of(fwnode, struct property_set, fwnode) : NULL;
}

static const struct property_entry *pset_prop_get(struct property_set *pset,
const char *name)
#define to_pset_node(__fwnode) \
({ \
typeof(__fwnode) __to_pset_node_fwnode = __fwnode; \
\
is_pset_node(__to_pset_node_fwnode) ? \
container_of(__to_pset_node_fwnode, \
struct property_set, fwnode) : \
NULL; \
})

static const struct property_entry *
pset_prop_get(const struct property_set *pset, const char *name)
{
const struct property_entry *prop;

Expand All @@ -53,7 +57,7 @@ static const struct property_entry *pset_prop_get(struct property_set *pset,
return NULL;
}

static const void *pset_prop_find(struct property_set *pset,
static const void *pset_prop_find(const struct property_set *pset,
const char *propname, size_t length)
{
const struct property_entry *prop;
Expand All @@ -73,7 +77,7 @@ static const void *pset_prop_find(struct property_set *pset,
return pointer;
}

static int pset_prop_read_u8_array(struct property_set *pset,
static int pset_prop_read_u8_array(const struct property_set *pset,
const char *propname,
u8 *values, size_t nval)
{
Expand All @@ -88,7 +92,7 @@ static int pset_prop_read_u8_array(struct property_set *pset,
return 0;
}

static int pset_prop_read_u16_array(struct property_set *pset,
static int pset_prop_read_u16_array(const struct property_set *pset,
const char *propname,
u16 *values, size_t nval)
{
Expand All @@ -103,7 +107,7 @@ static int pset_prop_read_u16_array(struct property_set *pset,
return 0;
}

static int pset_prop_read_u32_array(struct property_set *pset,
static int pset_prop_read_u32_array(const struct property_set *pset,
const char *propname,
u32 *values, size_t nval)
{
Expand All @@ -118,7 +122,7 @@ static int pset_prop_read_u32_array(struct property_set *pset,
return 0;
}

static int pset_prop_read_u64_array(struct property_set *pset,
static int pset_prop_read_u64_array(const struct property_set *pset,
const char *propname,
u64 *values, size_t nval)
{
Expand All @@ -133,7 +137,7 @@ static int pset_prop_read_u64_array(struct property_set *pset,
return 0;
}

static int pset_prop_count_elems_of_size(struct property_set *pset,
static int pset_prop_count_elems_of_size(const struct property_set *pset,
const char *propname, size_t length)
{
const struct property_entry *prop;
Expand All @@ -145,7 +149,7 @@ static int pset_prop_count_elems_of_size(struct property_set *pset,
return prop->length / length;
}

static int pset_prop_read_string_array(struct property_set *pset,
static int pset_prop_read_string_array(const struct property_set *pset,
const char *propname,
const char **strings, size_t nval)
{
Expand Down

0 comments on commit 39e5aee

Please sign in to comment.