diff options
| author |   Krzysztof Kozlowski <krzk@kernel.org> | 2020-09-02 17:06:42 +0200 |
|---|---|---|
| committer |   Wolfram Sang <wsa@kernel.org> | 2020-09-18 23:02:02 +0200 |
| commit | 432d159a02bdca446578290015d0874e26fc5342 (patch) | |
| tree | ef9b0dac45fc0191a7c12575cabfc97198158eca /drivers/i2c/muxes | |
| parent | i2c: rcar: refactor and shorten timeout when resetting (diff) | |
| download | wireguard-linux-432d159a02bdca446578290015d0874e26fc5342.tar.xz wireguard-linux-432d159a02bdca446578290015d0874e26fc5342.zip | |
i2c: mux: gpmux: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Diffstat (limited to 'drivers/i2c/muxes')
| -rw-r--r-- | drivers/i2c/muxes/i2c-mux-gpmux.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-gpmux.c b/drivers/i2c/muxes/i2c-mux-gpmux.c index f830535cff12..d3acd8d66c32 100644 --- a/drivers/i2c/muxes/i2c-mux-gpmux.c +++ b/drivers/i2c/muxes/i2c-mux-gpmux.c @@ -85,18 +85,14 @@ static int i2c_mux_probe(struct platform_device *pdev) return -ENOMEM; mux->control = devm_mux_control_get(dev, NULL); - if (IS_ERR(mux->control)) { - if (PTR_ERR(mux->control) != -EPROBE_DEFER) - dev_err(dev, "failed to get control-mux\n"); - return PTR_ERR(mux->control); - } + if (IS_ERR(mux->control)) + return dev_err_probe(dev, PTR_ERR(mux->control), + "failed to get control-mux\n"); parent = mux_parent_adapter(dev); - if (IS_ERR(parent)) { - if (PTR_ERR(parent) != -EPROBE_DEFER) - dev_err(dev, "failed to get i2c-parent adapter\n"); - return PTR_ERR(parent); - } + if (IS_ERR(parent)) + return dev_err_probe(dev, PTR_ERR(parent), + "failed to get i2c-parent adapter\n"); children = of_get_child_count(np); |