@@ -44,11 +44,9 @@ static int stm32_vrefbuf_enable(struct regulator_dev *rdev)
44
44
u32 val ;
45
45
int ret ;
46
46
47
- ret = pm_runtime_get_sync (priv -> dev );
48
- if (ret < 0 ) {
49
- pm_runtime_put_noidle (priv -> dev );
47
+ ret = pm_runtime_resume_and_get (priv -> dev );
48
+ if (ret < 0 )
50
49
return ret ;
51
- }
52
50
53
51
val = readl_relaxed (priv -> base + STM32_VREFBUF_CSR );
54
52
val = (val & ~STM32_HIZ ) | STM32_ENVR ;
@@ -81,11 +79,9 @@ static int stm32_vrefbuf_disable(struct regulator_dev *rdev)
81
79
u32 val ;
82
80
int ret ;
83
81
84
- ret = pm_runtime_get_sync (priv -> dev );
85
- if (ret < 0 ) {
86
- pm_runtime_put_noidle (priv -> dev );
82
+ ret = pm_runtime_resume_and_get (priv -> dev );
83
+ if (ret < 0 )
87
84
return ret ;
88
- }
89
85
90
86
val = readl_relaxed (priv -> base + STM32_VREFBUF_CSR );
91
87
val &= ~STM32_ENVR ;
@@ -102,11 +98,9 @@ static int stm32_vrefbuf_is_enabled(struct regulator_dev *rdev)
102
98
struct stm32_vrefbuf * priv = rdev_get_drvdata (rdev );
103
99
int ret ;
104
100
105
- ret = pm_runtime_get_sync (priv -> dev );
106
- if (ret < 0 ) {
107
- pm_runtime_put_noidle (priv -> dev );
101
+ ret = pm_runtime_resume_and_get (priv -> dev );
102
+ if (ret < 0 )
108
103
return ret ;
109
- }
110
104
111
105
ret = readl_relaxed (priv -> base + STM32_VREFBUF_CSR ) & STM32_ENVR ;
112
106
@@ -123,11 +117,9 @@ static int stm32_vrefbuf_set_voltage_sel(struct regulator_dev *rdev,
123
117
u32 val ;
124
118
int ret ;
125
119
126
- ret = pm_runtime_get_sync (priv -> dev );
127
- if (ret < 0 ) {
128
- pm_runtime_put_noidle (priv -> dev );
120
+ ret = pm_runtime_resume_and_get (priv -> dev );
121
+ if (ret < 0 )
129
122
return ret ;
130
- }
131
123
132
124
val = readl_relaxed (priv -> base + STM32_VREFBUF_CSR );
133
125
val = (val & ~STM32_VRS ) | FIELD_PREP (STM32_VRS , sel );
@@ -145,11 +137,9 @@ static int stm32_vrefbuf_get_voltage_sel(struct regulator_dev *rdev)
145
137
u32 val ;
146
138
int ret ;
147
139
148
- ret = pm_runtime_get_sync (priv -> dev );
149
- if (ret < 0 ) {
150
- pm_runtime_put_noidle (priv -> dev );
140
+ ret = pm_runtime_resume_and_get (priv -> dev );
141
+ if (ret < 0 )
151
142
return ret ;
152
- }
153
143
154
144
val = readl_relaxed (priv -> base + STM32_VREFBUF_CSR );
155
145
ret = FIELD_GET (STM32_VRS , val );
0 commit comments