From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
To: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Hans de Goede <hdegoede@redhat.com>,
Wolfram Sang <wsa@the-dreams.de>
Subject: [PATCH v5 2/4] device property: constify property arrays values
Date: Thu, 2 Feb 2017 17:41:26 -0800 [thread overview]
Message-ID: <20170203014128.317-3-dmitry.torokhov@gmail.com> (raw)
In-Reply-To: <20170203014128.317-1-dmitry.torokhov@gmail.com>
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 <dmitry.torokhov@gmail.com>
---
drivers/base/property.c | 10 +++++-----
include/linux/property.h | 12 ++++++------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/base/property.c b/drivers/base/property.c
index e9fa75645d69..31b942a29fdc 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -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);
diff --git a/include/linux/property.h b/include/linux/property.h
index d37a4498b3ac..7a0a1cce5165 100644
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -160,12 +160,12 @@ struct property_entry {
bool is_string;
union {
union {
- void *raw_data;
- u8 *u8_data;
- u16 *u16_data;
- u32 *u32_data;
- u64 *u64_data;
- const char **str;
+ const void *raw_data;
+ const u8 *u8_data;
+ const u16 *u16_data;
+ const u32 *u32_data;
+ const u64 *u64_data;
+ const char * const *str;
} pointer;
union {
unsigned long long raw_data;
--
2.11.0.483.g087da7b7c-goog
next prev parent reply other threads:[~2017-02-03 1:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-03 1:41 [PATCH v5 0/4] Export APIs to copy device properties & more Dmitry Torokhov
2017-02-03 1:41 ` [PATCH v5 1/4] device property: allow to constify properties Dmitry Torokhov
2017-02-03 11:40 ` Andy Shevchenko
2017-02-03 15:09 ` Dmitry Torokhov
2017-02-03 1:41 ` Dmitry Torokhov [this message]
2017-02-03 11:43 ` [PATCH v5 2/4] device property: constify property arrays values Andy Shevchenko
2017-02-03 15:12 ` Dmitry Torokhov
2017-02-03 1:41 ` [PATCH v5 3/4] device property: export code duplicating array of property entries Dmitry Torokhov
2017-02-03 11:45 ` Andy Shevchenko
2017-02-03 15:15 ` Dmitry Torokhov
2017-02-03 1:41 ` [PATCH v5 4/4] i2c: allow specify device properties in i2c_board_info Dmitry Torokhov
2017-02-03 11:46 ` Andy Shevchenko
2017-02-07 12:44 ` Rafael J. Wysocki
2017-02-07 13:25 ` Wolfram Sang
2017-02-09 13:52 ` [PATCH v5 0/4] Export APIs to copy device properties & more Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170203014128.317-3-dmitry.torokhov@gmail.com \
--to=dmitry.torokhov@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael.j.wysocki@intel.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).