@@ -1035,34 +1035,34 @@ static int ad7380_init(struct ad7380_state *st, bool external_ref_en)
1035
1035
1036
1036
static int ad7380_probe (struct spi_device * spi )
1037
1037
{
1038
+ struct device * dev = & spi -> dev ;
1038
1039
struct iio_dev * indio_dev ;
1039
1040
struct ad7380_state * st ;
1040
1041
bool external_ref_en ;
1041
1042
int ret , i ;
1042
1043
1043
- indio_dev = devm_iio_device_alloc (& spi -> dev , sizeof (* st ));
1044
+ indio_dev = devm_iio_device_alloc (dev , sizeof (* st ));
1044
1045
if (!indio_dev )
1045
1046
return - ENOMEM ;
1046
1047
1047
1048
st = iio_priv (indio_dev );
1048
1049
st -> spi = spi ;
1049
1050
st -> chip_info = spi_get_device_match_data (spi );
1050
1051
if (!st -> chip_info )
1051
- return dev_err_probe (& spi -> dev , - EINVAL , "missing match data\n" );
1052
+ return dev_err_probe (dev , - EINVAL , "missing match data\n" );
1052
1053
1053
- ret = devm_regulator_bulk_get_enable (& spi -> dev , st -> chip_info -> num_supplies ,
1054
+ ret = devm_regulator_bulk_get_enable (dev , st -> chip_info -> num_supplies ,
1054
1055
st -> chip_info -> supplies );
1055
1056
1056
1057
if (ret )
1057
- return dev_err_probe (& spi -> dev , ret ,
1058
+ return dev_err_probe (dev , ret ,
1058
1059
"Failed to enable power supplies\n" );
1059
1060
fsleep (T_POWERUP_US );
1060
1061
1061
1062
if (st -> chip_info -> external_ref_only ) {
1062
- ret = devm_regulator_get_enable_read_voltage (& spi -> dev ,
1063
- "refin" );
1063
+ ret = devm_regulator_get_enable_read_voltage (dev , "refin" );
1064
1064
if (ret < 0 )
1065
- return dev_err_probe (& spi -> dev , ret ,
1065
+ return dev_err_probe (dev , ret ,
1066
1066
"Failed to get refin regulator\n" );
1067
1067
1068
1068
st -> vref_mv = ret / 1000 ;
@@ -1074,18 +1074,17 @@ static int ad7380_probe(struct spi_device *spi)
1074
1074
* If there is no REFIO supply, then it means that we are using
1075
1075
* the internal reference, otherwise REFIO is reference voltage.
1076
1076
*/
1077
- ret = devm_regulator_get_enable_read_voltage (& spi -> dev ,
1078
- "refio" );
1077
+ ret = devm_regulator_get_enable_read_voltage (dev , "refio" );
1079
1078
if (ret < 0 && ret != - ENODEV )
1080
- return dev_err_probe (& spi -> dev , ret ,
1079
+ return dev_err_probe (dev , ret ,
1081
1080
"Failed to get refio regulator\n" );
1082
1081
1083
1082
external_ref_en = ret != - ENODEV ;
1084
1083
st -> vref_mv = external_ref_en ? ret / 1000 : AD7380_INTERNAL_REF_MV ;
1085
1084
}
1086
1085
1087
1086
if (st -> chip_info -> num_vcm_supplies > ARRAY_SIZE (st -> vcm_mv ))
1088
- return dev_err_probe (& spi -> dev , - EINVAL ,
1087
+ return dev_err_probe (dev , - EINVAL ,
1089
1088
"invalid number of VCM supplies\n" );
1090
1089
1091
1090
/*
@@ -1095,18 +1094,18 @@ static int ad7380_probe(struct spi_device *spi)
1095
1094
for (i = 0 ; i < st -> chip_info -> num_vcm_supplies ; i ++ ) {
1096
1095
const char * vcm = st -> chip_info -> vcm_supplies [i ];
1097
1096
1098
- ret = devm_regulator_get_enable_read_voltage (& spi -> dev , vcm );
1097
+ ret = devm_regulator_get_enable_read_voltage (dev , vcm );
1099
1098
if (ret < 0 )
1100
- return dev_err_probe (& spi -> dev , ret ,
1099
+ return dev_err_probe (dev , ret ,
1101
1100
"Failed to get %s regulator\n" ,
1102
1101
vcm );
1103
1102
1104
1103
st -> vcm_mv [i ] = ret / 1000 ;
1105
1104
}
1106
1105
1107
- st -> regmap = devm_regmap_init (& spi -> dev , NULL , st , & ad7380_regmap_config );
1106
+ st -> regmap = devm_regmap_init (dev , NULL , st , & ad7380_regmap_config );
1108
1107
if (IS_ERR (st -> regmap ))
1109
- return dev_err_probe (& spi -> dev , PTR_ERR (st -> regmap ),
1108
+ return dev_err_probe (dev , PTR_ERR (st -> regmap ),
1110
1109
"failed to allocate register map\n" );
1111
1110
1112
1111
/*
@@ -1157,7 +1156,7 @@ static int ad7380_probe(struct spi_device *spi)
1157
1156
indio_dev -> modes = INDIO_DIRECT_MODE ;
1158
1157
indio_dev -> available_scan_masks = st -> chip_info -> available_scan_masks ;
1159
1158
1160
- ret = devm_iio_triggered_buffer_setup (& spi -> dev , indio_dev ,
1159
+ ret = devm_iio_triggered_buffer_setup (dev , indio_dev ,
1161
1160
iio_pollfunc_store_time ,
1162
1161
ad7380_trigger_handler ,
1163
1162
& ad7380_buffer_setup_ops );
@@ -1168,7 +1167,7 @@ static int ad7380_probe(struct spi_device *spi)
1168
1167
if (ret )
1169
1168
return ret ;
1170
1169
1171
- return devm_iio_device_register (& spi -> dev , indio_dev );
1170
+ return devm_iio_device_register (dev , indio_dev );
1172
1171
}
1173
1172
1174
1173
static const struct of_device_id ad7380_of_match_table [] = {
0 commit comments