Commit d5ce5d38 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown

ASoC: codecs: wsa883x: Simplify &pdev->dev in probe

The probe already stores pointer to &pdev->dev, so use it to make the
code a bit easier to read.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230102114152.297305-1-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent aea11bcd
...@@ -1375,7 +1375,7 @@ static int wsa883x_probe(struct sdw_slave *pdev, ...@@ -1375,7 +1375,7 @@ static int wsa883x_probe(struct sdw_slave *pdev,
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int ret; int ret;
wsa883x = devm_kzalloc(&pdev->dev, sizeof(*wsa883x), GFP_KERNEL); wsa883x = devm_kzalloc(dev, sizeof(*wsa883x), GFP_KERNEL);
if (!wsa883x) if (!wsa883x)
return -ENOMEM; return -ENOMEM;
...@@ -1388,17 +1388,17 @@ static int wsa883x_probe(struct sdw_slave *pdev, ...@@ -1388,17 +1388,17 @@ static int wsa883x_probe(struct sdw_slave *pdev,
if (ret) if (ret)
return dev_err_probe(dev, ret, "Failed to enable vdd regulator\n"); return dev_err_probe(dev, ret, "Failed to enable vdd regulator\n");
wsa883x->sd_n = devm_gpiod_get_optional(&pdev->dev, "powerdown", wsa883x->sd_n = devm_gpiod_get_optional(dev, "powerdown",
GPIOD_FLAGS_BIT_NONEXCLUSIVE | GPIOD_OUT_HIGH); GPIOD_FLAGS_BIT_NONEXCLUSIVE | GPIOD_OUT_HIGH);
if (IS_ERR(wsa883x->sd_n)) { if (IS_ERR(wsa883x->sd_n)) {
ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->sd_n), ret = dev_err_probe(dev, PTR_ERR(wsa883x->sd_n),
"Shutdown Control GPIO not found\n"); "Shutdown Control GPIO not found\n");
goto err; goto err;
} }
dev_set_drvdata(&pdev->dev, wsa883x); dev_set_drvdata(dev, wsa883x);
wsa883x->slave = pdev; wsa883x->slave = pdev;
wsa883x->dev = &pdev->dev; wsa883x->dev = dev;
wsa883x->sconfig.ch_count = 1; wsa883x->sconfig.ch_count = 1;
wsa883x->sconfig.bps = 1; wsa883x->sconfig.bps = 1;
wsa883x->sconfig.direction = SDW_DATA_DIR_RX; wsa883x->sconfig.direction = SDW_DATA_DIR_RX;
...@@ -1413,7 +1413,7 @@ static int wsa883x_probe(struct sdw_slave *pdev, ...@@ -1413,7 +1413,7 @@ static int wsa883x_probe(struct sdw_slave *pdev,
wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config); wsa883x->regmap = devm_regmap_init_sdw(pdev, &wsa883x_regmap_config);
if (IS_ERR(wsa883x->regmap)) { if (IS_ERR(wsa883x->regmap)) {
gpiod_direction_output(wsa883x->sd_n, 1); gpiod_direction_output(wsa883x->sd_n, 1);
ret = dev_err_probe(&pdev->dev, PTR_ERR(wsa883x->regmap), ret = dev_err_probe(dev, PTR_ERR(wsa883x->regmap),
"regmap_init failed\n"); "regmap_init failed\n");
goto err; goto err;
} }
...@@ -1423,7 +1423,7 @@ static int wsa883x_probe(struct sdw_slave *pdev, ...@@ -1423,7 +1423,7 @@ static int wsa883x_probe(struct sdw_slave *pdev,
pm_runtime_set_active(dev); pm_runtime_set_active(dev);
pm_runtime_enable(dev); pm_runtime_enable(dev);
ret = devm_snd_soc_register_component(&pdev->dev, ret = devm_snd_soc_register_component(dev,
&wsa883x_component_drv, &wsa883x_component_drv,
wsa883x_dais, wsa883x_dais,
ARRAY_SIZE(wsa883x_dais)); ARRAY_SIZE(wsa883x_dais));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment