mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 18:22:00 -04:00
iio: frequency: admv1013: add dev variable
Introduce a local struct device pointer in functions that reference &spi->dev for device-managed resource calls and device property reads, improving code readability. Signed-off-by: Antoniu Miclaus <antoniu.miclaus@analog.com> Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
committed by
Jonathan Cameron
parent
b343f010d5
commit
e61b5bb0e9
@@ -518,11 +518,11 @@ static int admv1013_properties_parse(struct admv1013_state *st)
|
||||
{
|
||||
int ret;
|
||||
const char *str;
|
||||
struct spi_device *spi = st->spi;
|
||||
struct device *dev = &st->spi->dev;
|
||||
|
||||
st->det_en = device_property_read_bool(&spi->dev, "adi,detector-enable");
|
||||
st->det_en = device_property_read_bool(dev, "adi,detector-enable");
|
||||
|
||||
ret = device_property_read_string(&spi->dev, "adi,input-mode", &str);
|
||||
ret = device_property_read_string(dev, "adi,input-mode", &str);
|
||||
if (ret)
|
||||
st->input_mode = ADMV1013_IQ_MODE;
|
||||
|
||||
@@ -533,7 +533,7 @@ static int admv1013_properties_parse(struct admv1013_state *st)
|
||||
else
|
||||
return -EINVAL;
|
||||
|
||||
ret = device_property_read_string(&spi->dev, "adi,quad-se-mode", &str);
|
||||
ret = device_property_read_string(dev, "adi,quad-se-mode", &str);
|
||||
if (ret)
|
||||
st->quad_se_mode = ADMV1013_SE_MODE_DIFF;
|
||||
|
||||
@@ -546,11 +546,11 @@ static int admv1013_properties_parse(struct admv1013_state *st)
|
||||
else
|
||||
return -EINVAL;
|
||||
|
||||
ret = devm_regulator_bulk_get_enable(&st->spi->dev,
|
||||
ret = devm_regulator_bulk_get_enable(dev,
|
||||
ARRAY_SIZE(admv1013_vcc_regs),
|
||||
admv1013_vcc_regs);
|
||||
if (ret) {
|
||||
dev_err_probe(&spi->dev, ret,
|
||||
dev_err_probe(dev, ret,
|
||||
"Failed to request VCC regulators\n");
|
||||
return ret;
|
||||
}
|
||||
@@ -562,9 +562,10 @@ static int admv1013_probe(struct spi_device *spi)
|
||||
{
|
||||
struct iio_dev *indio_dev;
|
||||
struct admv1013_state *st;
|
||||
struct device *dev = &spi->dev;
|
||||
int ret, vcm_uv;
|
||||
|
||||
indio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
|
||||
indio_dev = devm_iio_device_alloc(dev, sizeof(*st));
|
||||
if (!indio_dev)
|
||||
return -ENOMEM;
|
||||
|
||||
@@ -581,20 +582,20 @@ static int admv1013_probe(struct spi_device *spi)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ret = devm_regulator_get_enable_read_voltage(&spi->dev, "vcm");
|
||||
ret = devm_regulator_get_enable_read_voltage(dev, "vcm");
|
||||
if (ret < 0)
|
||||
return dev_err_probe(&spi->dev, ret,
|
||||
return dev_err_probe(dev, ret,
|
||||
"failed to get the common-mode voltage\n");
|
||||
|
||||
vcm_uv = ret;
|
||||
|
||||
st->clkin = devm_clk_get_enabled(&spi->dev, "lo_in");
|
||||
st->clkin = devm_clk_get_enabled(dev, "lo_in");
|
||||
if (IS_ERR(st->clkin))
|
||||
return dev_err_probe(&spi->dev, PTR_ERR(st->clkin),
|
||||
return dev_err_probe(dev, PTR_ERR(st->clkin),
|
||||
"failed to get the LO input clock\n");
|
||||
|
||||
st->nb.notifier_call = admv1013_freq_change;
|
||||
ret = devm_clk_notifier_register(&spi->dev, st->clkin, &st->nb);
|
||||
ret = devm_clk_notifier_register(dev, st->clkin, &st->nb);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@@ -606,11 +607,11 @@ static int admv1013_probe(struct spi_device *spi)
|
||||
return ret;
|
||||
}
|
||||
|
||||
ret = devm_add_action_or_reset(&spi->dev, admv1013_powerdown, st);
|
||||
ret = devm_add_action_or_reset(dev, admv1013_powerdown, st);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return devm_iio_device_register(&spi->dev, indio_dev);
|
||||
return devm_iio_device_register(dev, indio_dev);
|
||||
}
|
||||
|
||||
static const struct spi_device_id admv1013_id[] = {
|
||||
|
||||
Reference in New Issue
Block a user