superrob1500
/
mirror-linux
mirror of https://github.com/torvalds/linux
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iio: adc: Remove redundant pm_runtime_mark_last_busy() calls 

pm_runtime_put_autosuspend(), pm_runtime_put_sync_autosuspend(),
pm_runtime_autosuspend() and pm_request_autosuspend() now include a call
to pm_runtime_mark_last_busy(). Remove the now-reduntant explicit call to
pm_runtime_mark_last_busy().

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Chen-Yu Tsai <wens@csie.org>
Link: https://patch.msgid.link/20250825135401.1765847-3-sakari.ailus@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
pull/1354/merge
Sakari Ailus 2025-08-25 16:53:51 +03:00 committed by Jonathan Cameron
parent 358db735b1
commit d5b9423b39
12 changed files with 6 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/iio/adc/ab8500-gpadc.c
View File

@ -607,7 +607,6 @@ static int ab8500_gpadc_read(struct ab8500_gpadc *gpadc,
} }
/* This eventually drops the regulator */ /* This eventually drops the regulator */
pm_runtime_mark_last_busy(gpadc->dev);
pm_runtime_put_autosuspend(gpadc->dev); pm_runtime_put_autosuspend(gpadc->dev);
return (high_data << 8) | low_data; return (high_data << 8) | low_data;

13
drivers/iio/adc/at91-sama5d2_adc.c
View File

@ -896,7 +896,6 @@ static int at91_adc_config_emr(struct at91_adc_state *st,
emr |= osr | AT91_SAMA5D2_TRACKX(trackx); emr |= osr | AT91_SAMA5D2_TRACKX(trackx);
at91_adc_writel(st, EMR, emr); at91_adc_writel(st, EMR, emr);
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
st->oversampling_ratio = oversampling_ratio; st->oversampling_ratio = oversampling_ratio;
@ -971,7 +970,6 @@ static int at91_adc_configure_touch(struct at91_adc_state *st, bool state)
AT91_SAMA5D2_IER_PEN | AT91_SAMA5D2_IER_NOPEN); AT91_SAMA5D2_IER_PEN | AT91_SAMA5D2_IER_NOPEN);
at91_adc_writel(st, TSMR, 0); at91_adc_writel(st, TSMR, 0);
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
return 0; return 0;
} }
@ -1142,10 +1140,8 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state)
at91_adc_configure_trigger_registers(st, state); at91_adc_configure_trigger_registers(st, state);
if (!state) { if (!state)
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
}
return 0; return 0;
} }
@ -1336,7 +1332,6 @@ static int at91_adc_buffer_prepare(struct iio_dev *indio_dev)
at91_adc_writel(st, IER, AT91_SAMA5D2_IER_DRDY); at91_adc_writel(st, IER, AT91_SAMA5D2_IER_DRDY);
pm_runtime_put: pm_runtime_put:
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
return ret; return ret;
} }
@ -1394,7 +1389,6 @@ static int at91_adc_buffer_postdisable(struct iio_dev *indio_dev)
if (st->dma_st.dma_chan) if (st->dma_st.dma_chan)
dmaengine_terminate_sync(st->dma_st.dma_chan); dmaengine_terminate_sync(st->dma_st.dma_chan);
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
return 0; return 0;
@ -1603,7 +1597,6 @@ static void at91_adc_setup_samp_freq(struct iio_dev *indio_dev, unsigned freq,
mr |= AT91_SAMA5D2_MR_TRACKTIM(tracktim); mr |= AT91_SAMA5D2_MR_TRACKTIM(tracktim);
at91_adc_writel(st, MR, mr); at91_adc_writel(st, MR, mr);
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
dev_dbg(&indio_dev->dev, "freq: %u, startup: %u, prescal: %u, tracktim=%u\n", dev_dbg(&indio_dev->dev, "freq: %u, startup: %u, prescal: %u, tracktim=%u\n",
@ -1809,7 +1802,6 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev,
at91_adc_readl(st, LCDR); at91_adc_readl(st, LCDR);
pm_runtime_put: pm_runtime_put:
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
return ret; return ret;
} }
@ -1890,7 +1882,6 @@ static int at91_adc_read_temp(struct iio_dev *indio_dev,
restore_config: restore_config:
/* Revert previous settings. */ /* Revert previous settings. */
at91_adc_temp_sensor_configure(st, false); at91_adc_temp_sensor_configure(st, false);
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -2465,7 +2456,6 @@ static int at91_adc_probe(struct platform_device *pdev)
dev_info(&pdev->dev, "version: %x\n", dev_info(&pdev->dev, "version: %x\n",
readl_relaxed(st->base + st->soc_info.platform->layout->VERSION)); readl_relaxed(st->base + st->soc_info.platform->layout->VERSION));
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
return 0; return 0;
@ -2567,7 +2557,6 @@ static int at91_adc_resume(struct device *dev)
at91_adc_configure_trigger_registers(st, true); at91_adc_configure_trigger_registers(st, true);
} }
pm_runtime_mark_last_busy(st->dev);
pm_runtime_put_autosuspend(st->dev); pm_runtime_put_autosuspend(st->dev);
return 0; return 0;

2
drivers/iio/adc/imx8qxp-adc.c
View File

@ -229,7 +229,6 @@ static int imx8qxp_adc_read_raw(struct iio_dev *indio_dev,
ret = wait_for_completion_interruptible_timeout(&adc->completion, ret = wait_for_completion_interruptible_timeout(&adc->completion,
IMX8QXP_ADC_TIMEOUT); IMX8QXP_ADC_TIMEOUT);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_sync_autosuspend(dev); pm_runtime_put_sync_autosuspend(dev);
if (ret == 0) { if (ret == 0) {
@ -295,7 +294,6 @@ static int imx8qxp_adc_reg_access(struct iio_dev *indio_dev, unsigned int reg,
*readval = readl(adc->regs + reg); *readval = readl(adc->regs + reg);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_sync_autosuspend(dev); pm_runtime_put_sync_autosuspend(dev);
return 0; return 0;

1
drivers/iio/adc/imx93_adc.c
View File

@ -260,7 +260,6 @@ static int imx93_adc_read_raw(struct iio_dev *indio_dev,
mutex_lock(&adc->lock); mutex_lock(&adc->lock);
ret = imx93_adc_read_channel_conversion(adc, chan->channel, val); ret = imx93_adc_read_channel_conversion(adc, chan->channel, val);
mutex_unlock(&adc->lock); mutex_unlock(&adc->lock);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_sync_autosuspend(dev); pm_runtime_put_sync_autosuspend(dev);
if (ret < 0) if (ret < 0)
return ret; return ret;

6
drivers/iio/adc/rcar-gyroadc.c
View File

@ -163,13 +163,11 @@ static int rcar_gyroadc_set_power(struct rcar_gyroadc *priv, bool on)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
if (on) { if (on)
return pm_runtime_resume_and_get(dev); return pm_runtime_resume_and_get(dev);
} else {
pm_runtime_mark_last_busy(dev);
return pm_runtime_put_autosuspend(dev); return pm_runtime_put_autosuspend(dev);
} }
}
static int rcar_gyroadc_read_raw(struct iio_dev *indio_dev, static int rcar_gyroadc_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan, struct iio_chan_spec const *chan,

2
drivers/iio/adc/rzg2l_adc.c
View File

@ -249,7 +249,6 @@ static int rzg2l_adc_conversion(struct iio_dev *indio_dev, struct rzg2l_adc *adc
rzg2l_adc_start_stop(adc, false); rzg2l_adc_start_stop(adc, false);
rpm_put: rpm_put:
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return ret; return ret;
} }
@ -411,7 +410,6 @@ static int rzg2l_adc_hw_init(struct device *dev, struct rzg2l_adc *adc)
rzg2l_adc_writel(adc, RZG2L_ADM(3), reg); rzg2l_adc_writel(adc, RZG2L_ADM(3), reg);
exit_hw_init: exit_hw_init:
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return ret; return ret;
} }

1
drivers/iio/adc/stm32-adc-core.c
View File

@ -794,7 +794,6 @@ static int stm32_adc_probe(struct platform_device *pdev)
goto err_irq_remove; goto err_irq_remove;
} }
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return 0; return 0;

7
drivers/iio/adc/stm32-adc.c
View File

@ -1528,7 +1528,6 @@ static int stm32_adc_single_conv(struct iio_dev *indio_dev,
stm32_adc_conv_irq_disable(adc); stm32_adc_conv_irq_disable(adc);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return ret; return ret;
@ -1564,7 +1563,6 @@ static int stm32_adc_write_raw(struct iio_dev *indio_dev,
adc->cfg->set_ovs(indio_dev, idx); adc->cfg->set_ovs(indio_dev, idx);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
adc->ovs_idx = idx; adc->ovs_idx = idx;
@ -1759,7 +1757,6 @@ static int stm32_adc_update_scan_mode(struct iio_dev *indio_dev,
adc->num_conv = bitmap_weight(scan_mask, iio_get_masklength(indio_dev)); adc->num_conv = bitmap_weight(scan_mask, iio_get_masklength(indio_dev));
ret = stm32_adc_conf_scan_seq(indio_dev, scan_mask); ret = stm32_adc_conf_scan_seq(indio_dev, scan_mask);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return ret; return ret;
@ -1808,7 +1805,6 @@ static int stm32_adc_debugfs_reg_access(struct iio_dev *indio_dev,
else else
*readval = stm32_adc_readl(adc, reg); *readval = stm32_adc_readl(adc, reg);
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return 0; return 0;
@ -1954,7 +1950,6 @@ static int stm32_adc_buffer_postenable(struct iio_dev *indio_dev)
err_clr_trig: err_clr_trig:
stm32_adc_set_trig(indio_dev, NULL); stm32_adc_set_trig(indio_dev, NULL);
err_pm_put: err_pm_put:
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return ret; return ret;
@ -1977,7 +1972,6 @@ static int stm32_adc_buffer_predisable(struct iio_dev *indio_dev)
if (stm32_adc_set_trig(indio_dev, NULL)) if (stm32_adc_set_trig(indio_dev, NULL))
dev_err(&indio_dev->dev, "Can't clear trigger\n"); dev_err(&indio_dev->dev, "Can't clear trigger\n");
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return 0; return 0;
@ -2614,7 +2608,6 @@ static int stm32_adc_probe(struct platform_device *pdev)
goto err_hw_stop; goto err_hw_stop;
} }
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
if (IS_ENABLED(CONFIG_DEBUG_FS)) if (IS_ENABLED(CONFIG_DEBUG_FS))

2
drivers/iio/adc/sun4i-gpadc-iio.c
View File

@ -244,7 +244,6 @@ static int sun4i_gpadc_read(struct iio_dev *indio_dev, int channel, int *val,
*val = info->temp_data; *val = info->temp_data;
ret = 0; ret = 0;
pm_runtime_mark_last_busy(indio_dev->dev.parent);
err: err:
pm_runtime_put_autosuspend(indio_dev->dev.parent); pm_runtime_put_autosuspend(indio_dev->dev.parent);
@ -271,7 +270,6 @@ static int sun4i_gpadc_temp_read(struct iio_dev *indio_dev, int *val)
regmap_read(info->regmap, SUN4I_GPADC_TEMP_DATA, val); regmap_read(info->regmap, SUN4I_GPADC_TEMP_DATA, val);
pm_runtime_mark_last_busy(indio_dev->dev.parent);
pm_runtime_put_autosuspend(indio_dev->dev.parent); pm_runtime_put_autosuspend(indio_dev->dev.parent);
return 0; return 0;

6
drivers/iio/adc/ti-ads1015.c
View File

@ -374,12 +374,10 @@ static int ads1015_set_power_state(struct ads1015_data *data, bool on)
int ret; int ret;
struct device *dev = regmap_get_device(data->regmap); struct device *dev = regmap_get_device(data->regmap);
if (on) { if (on)
ret = pm_runtime_resume_and_get(dev); ret = pm_runtime_resume_and_get(dev);
} else { else
pm_runtime_mark_last_busy(dev);
ret = pm_runtime_put_autosuspend(dev); ret = pm_runtime_put_autosuspend(dev);
}
return ret < 0 ? ret : 0; return ret < 0 ? ret : 0;
} }

1
drivers/iio/adc/ti-ads1100.c
View File

@ -105,7 +105,6 @@ static int ads1100_get_adc_result(struct ads1100_data *data, int chan, int *val)
ret = i2c_master_recv(data->client, (char *)&buffer, sizeof(buffer)); ret = i2c_master_recv(data->client, (char *)&buffer, sizeof(buffer));
pm_runtime_mark_last_busy(&data->client->dev);
pm_runtime_put_autosuspend(&data->client->dev); pm_runtime_put_autosuspend(&data->client->dev);
if (ret < 0) { if (ret < 0) {

2
drivers/iio/adc/ti-ads1119.c
View File

@ -291,7 +291,6 @@ static int ads1119_single_conversion(struct ads1119_state *st,
*val = sign_extend32(sample, chan->scan_type.realbits - 1); *val = sign_extend32(sample, chan->scan_type.realbits - 1);
ret = IIO_VAL_INT; ret = IIO_VAL_INT;
pdown: pdown:
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return ret; return ret;
} }
@ -470,7 +469,6 @@ static int ads1119_triggered_buffer_postdisable(struct iio_dev *indio_dev)
if (ret) if (ret)
return ret; return ret;
pm_runtime_mark_last_busy(dev);
pm_runtime_put_autosuspend(dev); pm_runtime_put_autosuspend(dev);
return 0; return 0;