From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Andrey Smirnov <andrew.smirnov@gmail.com>,
Guenter Roeck <linux@roeck-us.net>,
Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH v3 02/11] power: charger-manager: don't write through desc->properties
Date: Fri, 03 Apr 2020 22:20:31 +0200 [thread overview]
Message-ID: <a529e64edb81a4795fe0b6480f1e4051bed1b099.1585944770.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1585944770.git.mirq-linux@rere.qmqm.pl>
psy_desc->properties will become pointer to const. Avoid writing
through the pointer to enable constification of the tables elsewhere.
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
v3: initial version
---
drivers/power/supply/charger-manager.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/power/supply/charger-manager.c b/drivers/power/supply/charger-manager.c
index 887f5bb879e5..7ecb82107efb 100644
--- a/drivers/power/supply/charger-manager.c
+++ b/drivers/power/supply/charger-manager.c
@@ -1425,15 +1425,18 @@ static int cm_init_thermal_data(struct charger_manager *cm,
struct power_supply *fuel_gauge)
{
struct charger_desc *desc = cm->desc;
+ enum power_supply_property *props;
union power_supply_propval val;
int ret;
+ props = (void *)cm->charger_psy_desc.properties;
+
/* Verify whether fuel gauge provides battery temperature */
ret = power_supply_get_property(fuel_gauge,
POWER_SUPPLY_PROP_TEMP, &val);
if (!ret) {
- cm->charger_psy_desc.properties[cm->charger_psy_desc.num_properties] =
+ props[cm->charger_psy_desc.num_properties] =
POWER_SUPPLY_PROP_TEMP;
cm->charger_psy_desc.num_properties++;
cm->desc->measure_battery_temp = true;
@@ -1446,7 +1449,7 @@ static int cm_init_thermal_data(struct charger_manager *cm,
return PTR_ERR(cm->tzd_batt);
/* Use external thermometer */
- cm->charger_psy_desc.properties[cm->charger_psy_desc.num_properties] =
+ props[cm->charger_psy_desc.num_properties] =
POWER_SUPPLY_PROP_TEMP_AMBIENT;
cm->charger_psy_desc.num_properties++;
cm->desc->measure_battery_temp = true;
@@ -1622,6 +1625,7 @@ static int charger_manager_probe(struct platform_device *pdev)
union power_supply_propval val;
struct power_supply *fuel_gauge;
struct power_supply_config psy_cfg = {};
+ enum power_supply_property *props;
if (IS_ERR(desc)) {
dev_err(&pdev->dev, "No platform data (desc) found\n");
@@ -1717,7 +1721,7 @@ static int charger_manager_probe(struct platform_device *pdev)
cm->charger_psy_desc.name = cm->psy_name_buf;
/* Allocate for psy properties because they may vary */
- cm->charger_psy_desc.properties =
+ cm->charger_psy_desc.properties = props =
devm_kcalloc(&pdev->dev,
ARRAY_SIZE(default_charger_props) +
NUM_CHARGER_PSY_OPTIONAL,
@@ -1725,7 +1729,7 @@ static int charger_manager_probe(struct platform_device *pdev)
if (!cm->charger_psy_desc.properties)
return -ENOMEM;
- memcpy(cm->charger_psy_desc.properties, default_charger_props,
+ memcpy(props, default_charger_props,
sizeof(enum power_supply_property) *
ARRAY_SIZE(default_charger_props));
@@ -1738,14 +1742,14 @@ static int charger_manager_probe(struct platform_device *pdev)
}
if (!power_supply_get_property(fuel_gauge,
POWER_SUPPLY_PROP_CHARGE_NOW, &val)) {
- cm->charger_psy_desc.properties[cm->charger_psy_desc.num_properties] =
+ props[cm->charger_psy_desc.num_properties] =
POWER_SUPPLY_PROP_CHARGE_NOW;
cm->charger_psy_desc.num_properties++;
}
if (!power_supply_get_property(fuel_gauge,
POWER_SUPPLY_PROP_CURRENT_NOW,
&val)) {
- cm->charger_psy_desc.properties[cm->charger_psy_desc.num_properties] =
+ props[cm->charger_psy_desc.num_properties] =
POWER_SUPPLY_PROP_CURRENT_NOW;
cm->charger_psy_desc.num_properties++;
}
--
2.20.1
next prev parent reply other threads:[~2020-04-03 20:20 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-03 20:20 [PATCH v3 00/11] extensions and fixes Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 01/11] power: charger-manager: remove duplicate assignment Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 03/11] power: generic-adc-battery: fold psy_props[] to private data Michał Mirosław
2020-04-03 20:20 ` Michał Mirosław [this message]
2020-05-01 12:38 ` [PATCH v3 02/11] power: charger-manager: don't write through desc->properties Sebastian Reichel
2020-05-01 13:30 ` Michał Mirosław
2020-05-01 13:39 ` [PATCH] power: charger-manager: fix adding of optional properties Michał Mirosław
2020-05-01 13:51 ` Sebastian Reichel
2020-05-01 14:15 ` Michał Mirosław
2020-05-01 14:30 ` [PATCH] power: charger-manager: clarify num_properties starting value Michał Mirosław
2020-05-01 14:58 ` Sebastian Reichel
2020-05-01 13:48 ` [PATCH v3 02/11] power: charger-manager: don't write through desc->properties Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 05/11] power: supply: core: allow to constify property lists Michał Mirosław
2020-05-01 12:36 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 04/11] power: supply: core: reduce power_supply_show_usb_type() parameters Michał Mirosław
2020-05-01 12:36 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 06/11] power: supply: core: fix HWMON temperature labels Michał Mirosław
2020-05-01 12:39 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 07/11] power: supply: core: tabularize " Michał Mirosław
2020-04-05 1:52 ` kbuild test robot
2020-04-07 18:13 ` Nick Desaulniers
2020-04-07 19:55 ` Michał Mirosław
2020-04-07 19:57 ` Nick Desaulniers
2020-04-07 22:31 ` Nick Desaulniers
2020-04-20 9:22 ` Michał Mirosław
2020-05-01 12:47 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 08/11] power: supply: core: hide unused HWMON labels Michał Mirosław
2020-05-01 13:22 ` Sebastian Reichel
2020-04-03 20:20 ` [PATCH v3 09/11] power: supply: core: add input voltage/current measurements Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 10/11] power: supply: core: add output voltage measurements Michał Mirosław
2020-04-03 20:20 ` [PATCH v3 11/11] power: supply: core: document measurement points Michał Mirosław
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=a529e64edb81a4795fe0b6480f1e4051bed1b099.1585944770.git.mirq-linux@rere.qmqm.pl \
--to=mirq-linux@rere.qmqm.pl \
--cc=andrew.smirnov@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=sebastian.reichel@collabora.com \
/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).