mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
device property: constify property arrays values
Data that is fed into property arrays should not be modified, so let's mark relevant pointers as const. This will allow us making source arrays as const/__initconst. Signed-off-by: Dmitry Torokhov <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
This commit is contained in:
parent
bec84da8d1
commit
9426998ce6
2 changed files with 11 additions and 11 deletions
|
|
@ -718,7 +718,8 @@ static void pset_free_set(struct property_set *pset)
|
|||
static int pset_copy_entry(struct property_entry *dst,
|
||||
const struct property_entry *src)
|
||||
{
|
||||
const char **d, **s;
|
||||
const char * const *s;
|
||||
char **d;
|
||||
size_t i, nval;
|
||||
|
||||
dst->name = kstrdup(src->name, GFP_KERNEL);
|
||||
|
|
@ -731,12 +732,11 @@ static int pset_copy_entry(struct property_entry *dst,
|
|||
|
||||
if (src->is_string) {
|
||||
nval = src->length / sizeof(const char *);
|
||||
dst->pointer.str = kcalloc(nval, sizeof(const char *),
|
||||
GFP_KERNEL);
|
||||
if (!dst->pointer.str)
|
||||
d = kcalloc(nval, sizeof(const char *), GFP_KERNEL);
|
||||
if (!d)
|
||||
return -ENOMEM;
|
||||
|
||||
d = dst->pointer.str;
|
||||
dst->pointer.raw_data = d;
|
||||
s = src->pointer.str;
|
||||
for (i = 0; i < nval; i++) {
|
||||
d[i] = kstrdup(s[i], GFP_KERNEL);
|
||||
|
|
|
|||
Loading…
Reference in a new issue