@@ -888,7 +888,6 @@ sx9324_get_default_reg(struct device *dev, int idx,
888
888
char prop [] = SX9324_PROXRAW_DEF ;
889
889
u32 start = 0 , raw = 0 , pos = 0 ;
890
890
int ret , count , ph , pin ;
891
- const char * res ;
892
891
893
892
memcpy (reg_def , & sx9324_default_regs [idx ], sizeof (* reg_def ));
894
893
@@ -915,24 +914,21 @@ sx9324_get_default_reg(struct device *dev, int idx,
915
914
reg_def -> def = raw ;
916
915
break ;
917
916
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 ));
922
920
if (ret >= 0 ) {
923
921
reg_def -> def &= ~SX9324_REG_AFE_CTRL0_CSIDLE_MASK ;
924
922
reg_def -> def |= ret << SX9324_REG_AFE_CTRL0_CSIDLE_SHIFT ;
925
923
}
926
924
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
+ }
936
932
break ;
937
933
case SX9324_REG_AFE_CTRL4 :
938
934
case SX9324_REG_AFE_CTRL7 :
0 commit comments