From: "Uwe Kleine-König" <ukleinek@debian.org>
To: Sebastian Reichel <sre@kernel.org>, Chen-Yu Tsai <wens@kernel.org>
Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 3/4] power: supply: axp20x_usb: Introduce a helper variable for &pdev->dev
Date: Mon, 21 Sep 2026 11:41:48 +0200 [thread overview]
Message-ID: <f0e6c7ff8dce9f1a0903d83ff3ef782a18cd63d2.1789983244.git.ukleinek@debian.org> (raw)
In-Reply-To: <cover.1789983244.git.ukleinek@debian.org>
With the next commit adding several new usages of &pdev->dev, a helper
variable is well justified. To not clutter that commit, split out the
introduction of the helper out in this separate change to simplify
review.
Signed-off-by: Uwe Kleine-König <ukleinek@debian.org>
---
drivers/power/supply/axp20x_usb_power.c | 34 ++++++++++++-------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/drivers/power/supply/axp20x_usb_power.c b/drivers/power/supply/axp20x_usb_power.c
index 463f9fe35cec..7ee3ec49d695 100644
--- a/drivers/power/supply/axp20x_usb_power.c
+++ b/drivers/power/supply/axp20x_usb_power.c
@@ -918,70 +918,70 @@ static void axp20x_usb_power_parse_dt(struct device *dev,
static int axp20x_usb_power_probe(struct platform_device *pdev)
{
- struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
+ struct device *dev = &pdev->dev;
+ struct axp20x_dev *axp20x = dev_get_drvdata(dev->parent);
struct power_supply_config psy_cfg = {};
struct axp20x_usb_power *power;
const struct axp_data *axp_data;
int i, irq, ret;
if (!axp20x) {
- dev_err(&pdev->dev, "Parent drvdata not set\n");
+ dev_err(dev, "Parent drvdata not set\n");
return -EINVAL;
}
- axp_data = of_device_get_match_data(&pdev->dev);
+ axp_data = of_device_get_match_data(dev);
- power = devm_kzalloc(&pdev->dev,
- struct_size(power, irqs, axp_data->num_irq_names),
+ power = devm_kzalloc(dev, struct_size(power, irqs, axp_data->num_irq_names),
GFP_KERNEL);
if (!power)
return -ENOMEM;
platform_set_drvdata(pdev, power);
- power->dev = &pdev->dev;
+ power->dev = dev;
power->axp_data = axp_data;
power->regmap = axp20x->regmap;
power->num_irqs = axp_data->num_irq_names;
- power->curr_lim_fld = devm_regmap_field_alloc(&pdev->dev, power->regmap,
+ power->curr_lim_fld = devm_regmap_field_alloc(dev, power->regmap,
axp_data->curr_lim_fld);
if (IS_ERR(power->curr_lim_fld))
return PTR_ERR(power->curr_lim_fld);
- axp20x_usb_power_parse_dt(&pdev->dev, power);
+ axp20x_usb_power_parse_dt(dev, power);
- ret = axp20x_regmap_field_alloc_optional(&pdev->dev, power->regmap,
+ ret = axp20x_regmap_field_alloc_optional(dev, power->regmap,
axp_data->vbus_valid_bit,
&power->vbus_valid_bit);
if (ret)
return ret;
- ret = axp20x_regmap_field_alloc_optional(&pdev->dev, power->regmap,
+ ret = axp20x_regmap_field_alloc_optional(dev, power->regmap,
axp_data->vbus_mon_bit,
&power->vbus_mon_bit);
if (ret)
return ret;
- ret = axp20x_regmap_field_alloc_optional(&pdev->dev, power->regmap,
+ ret = axp20x_regmap_field_alloc_optional(dev, power->regmap,
axp_data->usb_bc_en_bit,
&power->usb_bc_en_bit);
if (ret)
return ret;
- ret = axp20x_regmap_field_alloc_optional(&pdev->dev, power->regmap,
+ ret = axp20x_regmap_field_alloc_optional(dev, power->regmap,
axp_data->usb_bc_det_fld,
&power->usb_bc_det_fld);
if (ret)
return ret;
- ret = axp20x_regmap_field_alloc_optional(&pdev->dev, power->regmap,
+ ret = axp20x_regmap_field_alloc_optional(dev, power->regmap,
axp_data->vbus_disable_bit,
&power->vbus_disable_bit);
if (ret)
return ret;
- ret = devm_delayed_work_autocancel(&pdev->dev, &power->vbus_detect,
+ ret = devm_delayed_work_autocancel(dev, &power->vbus_detect,
axp_data->axp20x_read_vbus);
if (ret)
return ret;
@@ -1008,10 +1008,10 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
return ret;
}
- psy_cfg.fwnode = dev_fwnode(&pdev->dev);
+ psy_cfg.fwnode = dev_fwnode(dev);
psy_cfg.drv_data = power;
- power->supply = devm_power_supply_register(&pdev->dev,
+ power->supply = devm_power_supply_register(dev,
axp_data->power_desc,
&psy_cfg);
if (IS_ERR(power->supply))
@@ -1024,7 +1024,7 @@ static int axp20x_usb_power_probe(struct platform_device *pdev)
return irq;
power->irqs[i] = regmap_irq_get_virq(axp20x->regmap_irqc, irq);
- ret = devm_request_any_context_irq(&pdev->dev, power->irqs[i],
+ ret = devm_request_any_context_irq(dev, power->irqs[i],
axp20x_usb_power_irq, 0,
DRVNAME, power);
if (ret < 0)
--
2.47.3
next prev parent reply other threads:[~2026-09-21 10:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-21 9:41 [PATCH 0/4] Drive-by changes to axp20x drivers Uwe Kleine-König
2026-09-21 9:41 ` [PATCH 1/4] pinctrl: axp209: Drop check for disabled devices Uwe Kleine-König
2026-09-21 9:41 ` [PATCH 2/4] power: supply: axp20x*: " Uwe Kleine-König
2026-09-21 9:41 ` Uwe Kleine-König [this message]
2026-09-21 9:41 ` [PATCH 4/4] power: supply: axp20x_usb: Improve probe error reporting Uwe Kleine-König
2026-09-21 13:09 ` [PATCH 0/4] Drive-by changes to axp20x drivers Chen-Yu Tsai
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=f0e6c7ff8dce9f1a0903d83ff3ef782a18cd63d2.1789983244.git.ukleinek@debian.org \
--to=ukleinek@debian.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=sre@kernel.org \
--cc=wens@kernel.org \
/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
all inboxes | Powered by JetHome®