Skip to content

Commit 7cd37d4

Browse files
andy-shevjic23
authored andcommitted
iio: frequency: admv1014: Switch to device_property_match_property_string()
Replace open coded device_property_match_property_string(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20230808162800.61651-5-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent 3f6e7aa commit 7cd37d4

File tree

1 file changed

+12
-19
lines changed

1 file changed

+12
-19
lines changed

drivers/iio/frequency/admv1014.c

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -710,7 +710,6 @@ static int admv1014_init(struct admv1014_state *st)
710710

711711
static int admv1014_properties_parse(struct admv1014_state *st)
712712
{
713-
const char *str;
714713
unsigned int i;
715714
struct spi_device *spi = st->spi;
716715
int ret;
@@ -719,27 +718,21 @@ static int admv1014_properties_parse(struct admv1014_state *st)
719718

720719
st->p1db_comp = device_property_read_bool(&spi->dev, "adi,p1db-compensation-enable");
721720

722-
ret = device_property_read_string(&spi->dev, "adi,input-mode", &str);
723-
if (ret) {
724-
st->input_mode = ADMV1014_IQ_MODE;
725-
} else {
726-
ret = match_string(input_mode_names, ARRAY_SIZE(input_mode_names), str);
727-
if (ret < 0)
728-
return ret;
729-
721+
ret = device_property_match_property_string(&spi->dev, "adi,input-mode",
722+
input_mode_names,
723+
ARRAY_SIZE(input_mode_names));
724+
if (ret >= 0)
730725
st->input_mode = ret;
731-
}
732-
733-
ret = device_property_read_string(&spi->dev, "adi,quad-se-mode", &str);
734-
if (ret) {
735-
st->quad_se_mode = ADMV1014_SE_MODE_POS;
736-
} else {
737-
ret = match_string(quad_se_mode_names, ARRAY_SIZE(quad_se_mode_names), str);
738-
if (ret < 0)
739-
return ret;
726+
else
727+
st->input_mode = ADMV1014_IQ_MODE;
740728

729+
ret = device_property_match_property_string(&spi->dev, "adi,quad-se-mode",
730+
quad_se_mode_names,
731+
ARRAY_SIZE(quad_se_mode_names));
732+
if (ret >= 0)
741733
st->quad_se_mode = ADMV1014_SE_MODE_POS + (ret * 3);
742-
}
734+
else
735+
st->quad_se_mode = ADMV1014_SE_MODE_POS;
743736

744737
for (i = 0; i < ADMV1014_NUM_REGULATORS; ++i)
745738
st->regulators[i].supply = admv1014_reg_name[i];

0 commit comments

Comments
 (0)