* [PATCH] power: supply: cpcap-battery: constify psy_desc
@ 2021-01-14 22:36 Sebastian Reichel
2021-01-14 23:31 ` Pavel Machek
0 siblings, 1 reply; 3+ messages in thread
From: Sebastian Reichel @ 2021-01-14 22:36 UTC (permalink / raw)
To: Sebastian Reichel
Cc: linux-omap, linux-pm, Sebastian Reichel, kernel,
Arthur Demchenkov, Carl Philipp Klemm, Merlijn Wajer,
Pavel Machek, Tony Lindgren
There is no dynamic information in cpcap-battery's
power-supply description struct, so let's make it
static const.
Cc: Arthur Demchenkov <spinal.by@gmail.com>
Cc: Carl Philipp Klemm <philipp@uvos.xyz>
Cc: Merlijn Wajer <merlijn@wizzup.org>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
---
I noticed this while reviewing Tony's patch series.
---
drivers/power/supply/cpcap-battery.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/power/supply/cpcap-battery.c b/drivers/power/supply/cpcap-battery.c
index 86ed41d9627f..6d5bcdb9f45d 100644
--- a/drivers/power/supply/cpcap-battery.c
+++ b/drivers/power/supply/cpcap-battery.c
@@ -999,9 +999,19 @@ static const struct of_device_id cpcap_battery_id_table[] = {
MODULE_DEVICE_TABLE(of, cpcap_battery_id_table);
#endif
+static const struct power_supply_desc cpcap_charger_battery_desc = {
+ .name = "battery",
+ .type = POWER_SUPPLY_TYPE_BATTERY,
+ .properties = cpcap_battery_props,
+ .num_properties = ARRAY_SIZE(cpcap_battery_props),
+ .get_property = cpcap_battery_get_property,
+ .set_property = cpcap_battery_set_property,
+ .property_is_writeable = cpcap_battery_property_is_writeable,
+ .external_power_changed = cpcap_battery_external_power_changed,
+};
+
static int cpcap_battery_probe(struct platform_device *pdev)
{
- struct power_supply_desc *psy_desc;
struct cpcap_battery_ddata *ddata;
const struct of_device_id *match;
struct power_supply_config psy_cfg = {};
@@ -1056,23 +1066,11 @@ static int cpcap_battery_probe(struct platform_device *pdev)
if (error)
return error;
- psy_desc = devm_kzalloc(ddata->dev, sizeof(*psy_desc), GFP_KERNEL);
- if (!psy_desc)
- return -ENOMEM;
-
- psy_desc->name = "battery";
- psy_desc->type = POWER_SUPPLY_TYPE_BATTERY;
- psy_desc->properties = cpcap_battery_props;
- psy_desc->num_properties = ARRAY_SIZE(cpcap_battery_props);
- psy_desc->get_property = cpcap_battery_get_property;
- psy_desc->set_property = cpcap_battery_set_property;
- psy_desc->property_is_writeable = cpcap_battery_property_is_writeable;
- psy_desc->external_power_changed = cpcap_battery_external_power_changed;
-
psy_cfg.of_node = pdev->dev.of_node;
psy_cfg.drv_data = ddata;
- ddata->psy = devm_power_supply_register(ddata->dev, psy_desc,
+ ddata->psy = devm_power_supply_register(ddata->dev,
+ &cpcap_charger_battery_desc,
&psy_cfg);
error = PTR_ERR_OR_ZERO(ddata->psy);
if (error) {
--
2.29.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] power: supply: cpcap-battery: constify psy_desc
2021-01-14 22:36 [PATCH] power: supply: cpcap-battery: constify psy_desc Sebastian Reichel
@ 2021-01-14 23:31 ` Pavel Machek
2021-01-15 6:57 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Pavel Machek @ 2021-01-14 23:31 UTC (permalink / raw)
To: Sebastian Reichel
Cc: Sebastian Reichel, linux-omap, linux-pm, kernel,
Arthur Demchenkov, Carl Philipp Klemm, Merlijn Wajer,
Tony Lindgren
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
On Thu 2021-01-14 23:36:17, Sebastian Reichel wrote:
> There is no dynamic information in cpcap-battery's
> power-supply description struct, so let's make it
> static const.
>
> Cc: Arthur Demchenkov <spinal.by@gmail.com>
> Cc: Carl Philipp Klemm <philipp@uvos.xyz>
> Cc: Merlijn Wajer <merlijn@wizzup.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
--
http://www.livejournal.com/~pavelmachek
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] power: supply: cpcap-battery: constify psy_desc
2021-01-14 23:31 ` Pavel Machek
@ 2021-01-15 6:57 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2021-01-15 6:57 UTC (permalink / raw)
To: Pavel Machek
Cc: Sebastian Reichel, Sebastian Reichel, linux-omap, linux-pm,
kernel, Arthur Demchenkov, Carl Philipp Klemm, Merlijn Wajer
* Pavel Machek <pavel@ucw.cz> [210114 23:32]:
> On Thu 2021-01-14 23:36:17, Sebastian Reichel wrote:
> > There is no dynamic information in cpcap-battery's
> > power-supply description struct, so let's make it
> > static const.
> >
> > Cc: Arthur Demchenkov <spinal.by@gmail.com>
> > Cc: Carl Philipp Klemm <philipp@uvos.xyz>
> > Cc: Merlijn Wajer <merlijn@wizzup.org>
>
> Acked-by: Pavel Machek <pavel@ucw.cz>
Acked-by: Tony Lindgren <tony@atomide.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-15 6:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-14 22:36 [PATCH] power: supply: cpcap-battery: constify psy_desc Sebastian Reichel
2021-01-14 23:31 ` Pavel Machek
2021-01-15 6:57 ` Tony Lindgren
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).