@@ -710,7 +710,6 @@ static int admv1014_init(struct admv1014_state *st)
710
710
711
711
static int admv1014_properties_parse (struct admv1014_state * st )
712
712
{
713
- const char * str ;
714
713
unsigned int i ;
715
714
struct spi_device * spi = st -> spi ;
716
715
int ret ;
@@ -719,27 +718,21 @@ static int admv1014_properties_parse(struct admv1014_state *st)
719
718
720
719
st -> p1db_comp = device_property_read_bool (& spi -> dev , "adi,p1db-compensation-enable" );
721
720
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 )
730
725
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 ;
740
728
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 )
741
733
st -> quad_se_mode = ADMV1014_SE_MODE_POS + (ret * 3 );
742
- }
734
+ else
735
+ st -> quad_se_mode = ADMV1014_SE_MODE_POS ;
743
736
744
737
for (i = 0 ; i < ADMV1014_NUM_REGULATORS ; ++ i )
745
738
st -> regulators [i ].supply = admv1014_reg_name [i ];
0 commit comments