Commit 36010866 authored by Hans de Goede's avatar Hans de Goede Committed by Sebastian Reichel

power: supply: axp288_fuel_gauge: Use devm_add_action_or_reset() for iio chan release

An existing comment already mentions we: "cannot use devm_iio_channel_get
because x86 systems lack the device<->channel maps which iio_channel_get
will try to use when passed a non NULL device pointer".

Work around this by registering a devm action to free the iio-channels.
This is a step on the way to fully converting the probe() function to
only use devm managed resources.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent 0b80eb6c
...@@ -666,6 +666,16 @@ static int axp288_fuel_gauge_read_initial_regs(struct axp288_fg_info *info) ...@@ -666,6 +666,16 @@ static int axp288_fuel_gauge_read_initial_regs(struct axp288_fg_info *info)
return 0; return 0;
} }
static void axp288_fuel_gauge_release_iio_chans(void *data)
{
struct axp288_fg_info *info = data;
int i;
for (i = 0; i < IIO_CHANNEL_NUM; i++)
if (!IS_ERR_OR_NULL(info->iio_channel[i]))
iio_channel_release(info->iio_channel[i]);
}
static int axp288_fuel_gauge_probe(struct platform_device *pdev) static int axp288_fuel_gauge_probe(struct platform_device *pdev)
{ {
int i, ret = 0; int i, ret = 0;
...@@ -711,37 +721,35 @@ static int axp288_fuel_gauge_probe(struct platform_device *pdev) ...@@ -711,37 +721,35 @@ static int axp288_fuel_gauge_probe(struct platform_device *pdev)
if (ret == -ENODEV) if (ret == -ENODEV)
ret = -EPROBE_DEFER; ret = -EPROBE_DEFER;
goto out_free_iio_chan; axp288_fuel_gauge_release_iio_chans(info);
return ret;
} }
} }
ret = devm_add_action_or_reset(dev, axp288_fuel_gauge_release_iio_chans, info);
if (ret)
return ret;
ret = iosf_mbi_block_punit_i2c_access(); ret = iosf_mbi_block_punit_i2c_access();
if (ret < 0) if (ret < 0)
goto out_free_iio_chan; return ret;
ret = axp288_fuel_gauge_read_initial_regs(info); ret = axp288_fuel_gauge_read_initial_regs(info);
iosf_mbi_unblock_punit_i2c_access(); iosf_mbi_unblock_punit_i2c_access();
if (ret < 0) if (ret < 0)
goto out_free_iio_chan; return ret;
psy_cfg.drv_data = info; psy_cfg.drv_data = info;
info->bat = power_supply_register(dev, &fuel_gauge_desc, &psy_cfg); info->bat = power_supply_register(dev, &fuel_gauge_desc, &psy_cfg);
if (IS_ERR(info->bat)) { if (IS_ERR(info->bat)) {
ret = PTR_ERR(info->bat); ret = PTR_ERR(info->bat);
dev_err(dev, "failed to register battery: %d\n", ret); dev_err(dev, "failed to register battery: %d\n", ret);
goto out_free_iio_chan; return ret;
} }
fuel_gauge_init_irq(info, pdev); fuel_gauge_init_irq(info, pdev);
return 0; return 0;
out_free_iio_chan:
for (i = 0; i < IIO_CHANNEL_NUM; i++)
if (!IS_ERR_OR_NULL(info->iio_channel[i]))
iio_channel_release(info->iio_channel[i]);
return ret;
} }
static const struct platform_device_id axp288_fg_id_table[] = { static const struct platform_device_id axp288_fg_id_table[] = {
...@@ -761,9 +769,6 @@ static int axp288_fuel_gauge_remove(struct platform_device *pdev) ...@@ -761,9 +769,6 @@ static int axp288_fuel_gauge_remove(struct platform_device *pdev)
if (info->irq[i] >= 0) if (info->irq[i] >= 0)
free_irq(info->irq[i], info); free_irq(info->irq[i], info);
for (i = 0; i < IIO_CHANNEL_NUM; i++)
iio_channel_release(info->iio_channel[i]);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment