Skip to content

Commit 17d59d9

Browse files
jhovoldbroonie
authored andcommitted
ASoC: codecs: wcd938x: use dev_printk() for impedance logging
Pass the component structure also to the wcd938x_mbhc_get_result_params() helper so that the component device can be used for logging consistently. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Link: https://lore.kernel.org/r/20230630142717.5314-4-johan+linaro@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 5db9fe9 commit 17d59d9

1 file changed

Lines changed: 8 additions & 7 deletions

File tree

sound/soc/codecs/wcd938x.c

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2124,10 +2124,11 @@ static int wcd938x_mbhc_micb_ctrl_threshold_mic(struct snd_soc_component *compon
21242124
return wcd938x_mbhc_micb_adjust_voltage(component, micb_mv, MIC_BIAS_2);
21252125
}
21262126

2127-
static void wcd938x_mbhc_get_result_params(struct wcd938x_priv *wcd938x,
2127+
static void wcd938x_mbhc_get_result_params(struct snd_soc_component *component,
21282128
s16 *d1_a, u16 noff,
21292129
int32_t *zdet)
21302130
{
2131+
struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);
21312132
int i;
21322133
int val, val1;
21332134
s16 c1;
@@ -2154,8 +2155,8 @@ static void wcd938x_mbhc_get_result_params(struct wcd938x_priv *wcd938x,
21542155
usleep_range(5000, 5050);
21552156

21562157
if (!c1 || !x1) {
2157-
pr_err("%s: Impedance detect ramp error, c1=%d, x1=0x%x\n",
2158-
__func__, c1, x1);
2158+
dev_err(component->dev, "Impedance detect ramp error, c1=%d, x1=0x%x\n",
2159+
c1, x1);
21592160
goto ramp_down;
21602161
}
21612162
d1 = d1_a[c1];
@@ -2165,8 +2166,8 @@ static void wcd938x_mbhc_get_result_params(struct wcd938x_priv *wcd938x,
21652166
else if (x1 < minCode_param[noff])
21662167
*zdet = WCD938X_ZDET_FLOATING_IMPEDANCE;
21672168

2168-
pr_debug("%s: d1=%d, c1=%d, x1=0x%x, z_val=%d (milliohm)\n",
2169-
__func__, d1, c1, x1, *zdet);
2169+
dev_dbg(component->dev, "%s: d1=%d, c1=%d, x1=0x%x, z_val=%d (milliohm)\n",
2170+
__func__, d1, c1, x1, *zdet);
21702171
ramp_down:
21712172
i = 0;
21722173
while (x1) {
@@ -2210,7 +2211,7 @@ static void wcd938x_mbhc_zdet_ramp(struct snd_soc_component *component,
22102211
WCD938X_ANA_MBHC_ZDET, 0x80, 0x80);
22112212
dev_dbg(component->dev, "%s: ramp for HPH_L, noff = %d\n",
22122213
__func__, zdet_param->noff);
2213-
wcd938x_mbhc_get_result_params(wcd938x, d1_a, zdet_param->noff, &zdet);
2214+
wcd938x_mbhc_get_result_params(component, d1_a, zdet_param->noff, &zdet);
22142215
regmap_update_bits(wcd938x->regmap,
22152216
WCD938X_ANA_MBHC_ZDET, 0x80, 0x00);
22162217

@@ -2224,7 +2225,7 @@ static void wcd938x_mbhc_zdet_ramp(struct snd_soc_component *component,
22242225
WCD938X_ANA_MBHC_ZDET, 0x40, 0x40);
22252226
dev_dbg(component->dev, "%s: ramp for HPH_R, noff = %d\n",
22262227
__func__, zdet_param->noff);
2227-
wcd938x_mbhc_get_result_params(wcd938x, d1_a, zdet_param->noff, &zdet);
2228+
wcd938x_mbhc_get_result_params(component, d1_a, zdet_param->noff, &zdet);
22282229
regmap_update_bits(wcd938x->regmap,
22292230
WCD938X_ANA_MBHC_ZDET, 0x40, 0x00);
22302231

0 commit comments

Comments
 (0)