File tree Expand file tree Collapse file tree 1 file changed +2
-24
lines changed
drivers/staging/iio/impedance-analyzer Expand file tree Collapse file tree 1 file changed +2
-24
lines changed Original file line number Diff line number Diff line change 84
84
85
85
struct ad5933_state {
86
86
struct i2c_client * client ;
87
- struct regulator * reg ;
88
87
struct clk * mclk ;
89
88
struct delayed_work work ;
90
89
struct mutex lock ; /* Protect sensor state */
@@ -660,13 +659,6 @@ static void ad5933_work(struct work_struct *work)
660
659
}
661
660
}
662
661
663
- static void ad5933_reg_disable (void * data )
664
- {
665
- struct ad5933_state * st = data ;
666
-
667
- regulator_disable (st -> reg );
668
- }
669
-
670
662
static int ad5933_probe (struct i2c_client * client )
671
663
{
672
664
const struct i2c_device_id * id = i2c_client_get_device_id (client );
@@ -685,23 +677,9 @@ static int ad5933_probe(struct i2c_client *client)
685
677
686
678
mutex_init (& st -> lock );
687
679
688
- st -> reg = devm_regulator_get (& client -> dev , "vdd" );
689
- if (IS_ERR (st -> reg ))
690
- return PTR_ERR (st -> reg );
691
-
692
- ret = regulator_enable (st -> reg );
693
- if (ret ) {
694
- dev_err (& client -> dev , "Failed to enable specified VDD supply\n" );
695
- return ret ;
696
- }
697
-
698
- ret = devm_add_action_or_reset (& client -> dev , ad5933_reg_disable , st );
699
- if (ret )
700
- return ret ;
701
-
702
- ret = regulator_get_voltage (st -> reg );
680
+ ret = devm_regulator_get_enable_read_voltage (& client -> dev , "vdd" );
703
681
if (ret < 0 )
704
- return ret ;
682
+ return dev_err_probe ( & client -> dev , ret , "failed to get vdd voltage\n" ) ;
705
683
706
684
st -> vref_mv = ret / 1000 ;
707
685
You can’t perform that action at this time.
0 commit comments