Skip to content

Commit 89e2233

Browse files
andy-shevjic23
authored andcommitted
iio: proximity: sx9324: 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-7-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
1 parent 1fce47a commit 89e2233

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

drivers/iio/proximity/sx9324.c

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,6 @@ sx9324_get_default_reg(struct device *dev, int idx,
888888
char prop[] = SX9324_PROXRAW_DEF;
889889
u32 start = 0, raw = 0, pos = 0;
890890
int ret, count, ph, pin;
891-
const char *res;
892891

893892
memcpy(reg_def, &sx9324_default_regs[idx], sizeof(*reg_def));
894893

@@ -915,24 +914,21 @@ sx9324_get_default_reg(struct device *dev, int idx,
915914
reg_def->def = raw;
916915
break;
917916
case SX9324_REG_AFE_CTRL0:
918-
ret = device_property_read_string(dev,
919-
"semtech,cs-idle-sleep", &res);
920-
if (!ret)
921-
ret = match_string(sx9324_csidle, ARRAY_SIZE(sx9324_csidle), res);
917+
ret = device_property_match_property_string(dev, "semtech,cs-idle-sleep",
918+
sx9324_csidle,
919+
ARRAY_SIZE(sx9324_csidle));
922920
if (ret >= 0) {
923921
reg_def->def &= ~SX9324_REG_AFE_CTRL0_CSIDLE_MASK;
924922
reg_def->def |= ret << SX9324_REG_AFE_CTRL0_CSIDLE_SHIFT;
925923
}
926924

927-
ret = device_property_read_string(dev,
928-
"semtech,int-comp-resistor", &res);
929-
if (ret)
930-
break;
931-
ret = match_string(sx9324_rints, ARRAY_SIZE(sx9324_rints), res);
932-
if (ret < 0)
933-
break;
934-
reg_def->def &= ~SX9324_REG_AFE_CTRL0_RINT_MASK;
935-
reg_def->def |= ret << SX9324_REG_AFE_CTRL0_RINT_SHIFT;
925+
ret = device_property_match_property_string(dev, "semtech,int-comp-resistor",
926+
sx9324_rints,
927+
ARRAY_SIZE(sx9324_rints));
928+
if (ret >= 0) {
929+
reg_def->def &= ~SX9324_REG_AFE_CTRL0_RINT_MASK;
930+
reg_def->def |= ret << SX9324_REG_AFE_CTRL0_RINT_SHIFT;
931+
}
936932
break;
937933
case SX9324_REG_AFE_CTRL4:
938934
case SX9324_REG_AFE_CTRL7:

0 commit comments

Comments
 (0)