[PATCH 3/4] power: supply: axp20x_usb: Introduce a helper variable for &pdev->dev

[Uwe Kleine-König]

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@xxxxxxxxxx>
---
 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