device property: Move device_add_properties() to swnode.c
Concentrating struct property_entry processing to drivers/base/swnode.c Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> 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:
Heikki Krogerus
Rafael J. Wysocki
parent
59abd83672
commit
ed1cdf31f9
|
|
@ -84,44 +84,6 @@ static const void *property_get_pointer(const struct property_entry *prop)
|
|||
}
|
||||
}
|
||||
|
||||
static void property_set_pointer(struct property_entry *prop, const void *pointer)
|
||||
{
|
||||
switch (prop->type) {
|
||||
case DEV_PROP_U8:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u8_data = pointer;
|
||||
else
|
||||
prop->value.u8_data = *((u8 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_U16:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u16_data = pointer;
|
||||
else
|
||||
prop->value.u16_data = *((u16 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_U32:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u32_data = pointer;
|
||||
else
|
||||
prop->value.u32_data = *((u32 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_U64:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u64_data = pointer;
|
||||
else
|
||||
prop->value.u64_data = *((u64 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_STRING:
|
||||
if (prop->is_array)
|
||||
prop->pointer.str = pointer;
|
||||
else
|
||||
prop->value.str = pointer;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static const void *pset_prop_find(const struct property_set *pset,
|
||||
const char *propname, size_t length)
|
||||
{
|
||||
|
|
@ -759,147 +721,6 @@ int fwnode_property_get_reference_args(const struct fwnode_handle *fwnode,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(fwnode_property_get_reference_args);
|
||||
|
||||
static void property_entry_free_data(const struct property_entry *p)
|
||||
{
|
||||
const void *pointer = property_get_pointer(p);
|
||||
size_t i, nval;
|
||||
|
||||
if (p->is_array) {
|
||||
if (p->type == DEV_PROP_STRING && p->pointer.str) {
|
||||
nval = p->length / sizeof(const char *);
|
||||
for (i = 0; i < nval; i++)
|
||||
kfree(p->pointer.str[i]);
|
||||
}
|
||||
kfree(pointer);
|
||||
} else if (p->type == DEV_PROP_STRING) {
|
||||
kfree(p->value.str);
|
||||
}
|
||||
kfree(p->name);
|
||||
}
|
||||
|
||||
static int property_copy_string_array(struct property_entry *dst,
|
||||
const struct property_entry *src)
|
||||
{
|
||||
const char **d;
|
||||
size_t nval = src->length / sizeof(*d);
|
||||
int i;
|
||||
|
||||
d = kcalloc(nval, sizeof(*d), GFP_KERNEL);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
||||
for (i = 0; i < nval; i++) {
|
||||
d[i] = kstrdup(src->pointer.str[i], GFP_KERNEL);
|
||||
if (!d[i] && src->pointer.str[i]) {
|
||||
while (--i >= 0)
|
||||
kfree(d[i]);
|
||||
kfree(d);
|
||||
return -ENOMEM;
|
||||
}
|
||||
}
|
||||
|
||||
dst->pointer.str = d;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int property_entry_copy_data(struct property_entry *dst,
|
||||
const struct property_entry *src)
|
||||
{
|
||||
const void *pointer = property_get_pointer(src);
|
||||
const void *new;
|
||||
int error;
|
||||
|
||||
if (src->is_array) {
|
||||
if (!src->length)
|
||||
return -ENODATA;
|
||||
|
||||
if (src->type == DEV_PROP_STRING) {
|
||||
error = property_copy_string_array(dst, src);
|
||||
if (error)
|
||||
return error;
|
||||
new = dst->pointer.str;
|
||||
} else {
|
||||
new = kmemdup(pointer, src->length, GFP_KERNEL);
|
||||
if (!new)
|
||||
return -ENOMEM;
|
||||
}
|
||||
} else if (src->type == DEV_PROP_STRING) {
|
||||
new = kstrdup(src->value.str, GFP_KERNEL);
|
||||
if (!new && src->value.str)
|
||||
return -ENOMEM;
|
||||
} else {
|
||||
new = pointer;
|
||||
}
|
||||
|
||||
dst->length = src->length;
|
||||
dst->is_array = src->is_array;
|
||||
dst->type = src->type;
|
||||
|
||||
property_set_pointer(dst, new);
|
||||
|
||||
dst->name = kstrdup(src->name, GFP_KERNEL);
|
||||
if (!dst->name)
|
||||
goto out_free_data;
|
||||
|
||||
return 0;
|
||||
|
||||
out_free_data:
|
||||
property_entry_free_data(dst);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
/**
|
||||
* property_entries_dup - duplicate array of properties
|
||||
* @properties: array of properties to copy
|
||||
*
|
||||
* This function creates a deep copy of the given NULL-terminated array
|
||||
* of property entries.
|
||||
*/
|
||||
struct property_entry *
|
||||
property_entries_dup(const struct property_entry *properties)
|
||||
{
|
||||
struct property_entry *p;
|
||||
int i, n = 0;
|
||||
|
||||
while (properties[n].name)
|
||||
n++;
|
||||
|
||||
p = kcalloc(n + 1, sizeof(*p), GFP_KERNEL);
|
||||
if (!p)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
int ret = property_entry_copy_data(&p[i], &properties[i]);
|
||||
if (ret) {
|
||||
while (--i >= 0)
|
||||
property_entry_free_data(&p[i]);
|
||||
kfree(p);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(property_entries_dup);
|
||||
|
||||
/**
|
||||
* property_entries_free - free previously allocated array of properties
|
||||
* @properties: array of properties to destroy
|
||||
*
|
||||
* This function frees given NULL-terminated array of property entries,
|
||||
* along with their data.
|
||||
*/
|
||||
void property_entries_free(const struct property_entry *properties)
|
||||
{
|
||||
const struct property_entry *p;
|
||||
|
||||
for (p = properties; p->name; p++)
|
||||
property_entry_free_data(p);
|
||||
|
||||
kfree(properties);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(property_entries_free);
|
||||
|
||||
/**
|
||||
* pset_free_set - releases memory allocated for copied property set
|
||||
* @pset: Property set to release
|
||||
|
|
|
|||
|
|
@ -64,6 +64,45 @@ property_entry_get(const struct property_entry *prop, const char *name)
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static void
|
||||
property_set_pointer(struct property_entry *prop, const void *pointer)
|
||||
{
|
||||
switch (prop->type) {
|
||||
case DEV_PROP_U8:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u8_data = pointer;
|
||||
else
|
||||
prop->value.u8_data = *((u8 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_U16:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u16_data = pointer;
|
||||
else
|
||||
prop->value.u16_data = *((u16 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_U32:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u32_data = pointer;
|
||||
else
|
||||
prop->value.u32_data = *((u32 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_U64:
|
||||
if (prop->is_array)
|
||||
prop->pointer.u64_data = pointer;
|
||||
else
|
||||
prop->value.u64_data = *((u64 *)pointer);
|
||||
break;
|
||||
case DEV_PROP_STRING:
|
||||
if (prop->is_array)
|
||||
prop->pointer.str = pointer;
|
||||
else
|
||||
prop->value.str = pointer;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
static const void *property_get_pointer(const struct property_entry *prop)
|
||||
{
|
||||
switch (prop->type) {
|
||||
|
|
@ -241,6 +280,151 @@ static int property_entry_read_string_array(const struct property_entry *props,
|
|||
return array_len;
|
||||
}
|
||||
|
||||
static void property_entry_free_data(const struct property_entry *p)
|
||||
{
|
||||
const void *pointer = property_get_pointer(p);
|
||||
size_t i, nval;
|
||||
|
||||
if (p->is_array) {
|
||||
if (p->type == DEV_PROP_STRING && p->pointer.str) {
|
||||
nval = p->length / sizeof(const char *);
|
||||
for (i = 0; i < nval; i++)
|
||||
kfree(p->pointer.str[i]);
|
||||
}
|
||||
kfree(pointer);
|
||||
} else if (p->type == DEV_PROP_STRING) {
|
||||
kfree(p->value.str);
|
||||
}
|
||||
kfree(p->name);
|
||||
}
|
||||
|
||||
static int property_copy_string_array(struct property_entry *dst,
|
||||
const struct property_entry *src)
|
||||
{
|
||||
const char **d;
|
||||
size_t nval = src->length / sizeof(*d);
|
||||
int i;
|
||||
|
||||
d = kcalloc(nval, sizeof(*d), GFP_KERNEL);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
||||
for (i = 0; i < nval; i++) {
|
||||
d[i] = kstrdup(src->pointer.str[i], GFP_KERNEL);
|
||||
if (!d[i] && src->pointer.str[i]) {
|
||||
while (--i >= 0)
|
||||
kfree(d[i]);
|
||||
kfree(d);
|
||||
return -ENOMEM;
|
||||
}
|
||||
}
|
||||
|
||||
dst->pointer.str = d;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int property_entry_copy_data(struct property_entry *dst,
|
||||
const struct property_entry *src)
|
||||
{
|
||||
const void *pointer = property_get_pointer(src);
|
||||
const void *new;
|
||||
int error;
|
||||
|
||||
if (src->is_array) {
|
||||
if (!src->length)
|
||||
return -ENODATA;
|
||||
|
||||
if (src->type == DEV_PROP_STRING) {
|
||||
error = property_copy_string_array(dst, src);
|
||||
if (error)
|
||||
return error;
|
||||
new = dst->pointer.str;
|
||||
} else {
|
||||
new = kmemdup(pointer, src->length, GFP_KERNEL);
|
||||
if (!new)
|
||||
return -ENOMEM;
|
||||
}
|
||||
} else if (src->type == DEV_PROP_STRING) {
|
||||
new = kstrdup(src->value.str, GFP_KERNEL);
|
||||
if (!new && src->value.str)
|
||||
return -ENOMEM;
|
||||
} else {
|
||||
new = pointer;
|
||||
}
|
||||
|
||||
dst->length = src->length;
|
||||
dst->is_array = src->is_array;
|
||||
dst->type = src->type;
|
||||
|
||||
property_set_pointer(dst, new);
|
||||
|
||||
dst->name = kstrdup(src->name, GFP_KERNEL);
|
||||
if (!dst->name)
|
||||
goto out_free_data;
|
||||
|
||||
return 0;
|
||||
|
||||
out_free_data:
|
||||
property_entry_free_data(dst);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
/**
|
||||
* property_entries_dup - duplicate array of properties
|
||||
* @properties: array of properties to copy
|
||||
*
|
||||
* This function creates a deep copy of the given NULL-terminated array
|
||||
* of property entries.
|
||||
*/
|
||||
struct property_entry *
|
||||
property_entries_dup(const struct property_entry *properties)
|
||||
{
|
||||
struct property_entry *p;
|
||||
int i, n = 0;
|
||||
int ret;
|
||||
|
||||
while (properties[n].name)
|
||||
n++;
|
||||
|
||||
p = kcalloc(n + 1, sizeof(*p), GFP_KERNEL);
|
||||
if (!p)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
for (i = 0; i < n; i++) {
|
||||
ret = property_entry_copy_data(&p[i], &properties[i]);
|
||||
if (ret) {
|
||||
while (--i >= 0)
|
||||
property_entry_free_data(&p[i]);
|
||||
kfree(p);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
}
|
||||
|
||||
return p;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(property_entries_dup);
|
||||
|
||||
/**
|
||||
* property_entries_free - free previously allocated array of properties
|
||||
* @properties: array of properties to destroy
|
||||
*
|
||||
* This function frees given NULL-terminated array of property entries,
|
||||
* along with their data.
|
||||
*/
|
||||
void property_entries_free(const struct property_entry *properties)
|
||||
{
|
||||
const struct property_entry *p;
|
||||
|
||||
if (!properties)
|
||||
return;
|
||||
|
||||
for (p = properties; p->name; p++)
|
||||
property_entry_free_data(p);
|
||||
|
||||
kfree(properties);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(property_entries_free);
|
||||
|
||||
/* -------------------------------------------------------------------------- */
|
||||
/* fwnode operations */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue