Simplify optional reset handling by using the function devm_reset_control_get_optional_exclusive().
Signed-off-by: Maíra Canal <[email protected]> --- drivers/gpu/drm/v3d/v3d_drv.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/v3d/v3d_drv.c b/drivers/gpu/drm/v3d/v3d_drv.c index 8de4f151a5c02cbf970e72933d1a275968088357..257f2fefbdb6f8736411de8965919f1728844a6a 100644 --- a/drivers/gpu/drm/v3d/v3d_drv.c +++ b/drivers/gpu/drm/v3d/v3d_drv.c @@ -398,18 +398,17 @@ static int v3d_platform_drm_probe(struct platform_device *pdev) v3d_perfmon_init(v3d); - v3d->reset = devm_reset_control_get_exclusive(dev, NULL); + v3d->reset = devm_reset_control_get_optional_exclusive(dev, NULL); if (IS_ERR(v3d->reset)) { - ret = PTR_ERR(v3d->reset); + ret = dev_err_probe(dev, PTR_ERR(v3d->reset), + "Failed to get reset control\n"); + goto clk_disable; + } - if (ret == -EPROBE_DEFER) - goto clk_disable; - - v3d->reset = NULL; + if (!v3d->reset) { ret = map_regs(v3d, &v3d->bridge_regs, "bridge"); if (ret) { - dev_err(dev, - "Failed to get reset control or bridge regs\n"); + dev_err(dev, "Failed to get bridge registers\n"); goto clk_disable; } } -- 2.52.0
