Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/lima: Reduce the amount of logs on deferred probe of clocks and reset controller

There is no point to print deferred probe messages as errors. Adjust
the printks for error paths of obtaining clocks and reset controller.
This removes the error message of lima_clk_init() call in favor or
specific failure messages inside.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190621162117.22533-4-krzk@kernel.org

authored by

Krzysztof Kozlowski and committed by
Qiang Yu
0e343b08 7b4e467d

+12 -6
+12 -6
drivers/gpu/drm/lima/lima_device.c
··· 84 84 dev->clk_bus = devm_clk_get(dev->dev, "bus"); 85 85 if (IS_ERR(dev->clk_bus)) { 86 86 err = PTR_ERR(dev->clk_bus); 87 - dev_err(dev->dev, "get bus clk failed %d\n", err); 87 + if (err != -EPROBE_DEFER) 88 + dev_err(dev->dev, "get bus clk failed %d\n", err); 88 89 return err; 89 90 } 90 91 91 92 dev->clk_gpu = devm_clk_get(dev->dev, "core"); 92 93 if (IS_ERR(dev->clk_gpu)) { 93 94 err = PTR_ERR(dev->clk_gpu); 94 - dev_err(dev->dev, "get core clk failed %d\n", err); 95 + if (err != -EPROBE_DEFER) 96 + dev_err(dev->dev, "get core clk failed %d\n", err); 95 97 return err; 96 98 } 97 99 ··· 108 106 dev->reset = devm_reset_control_get_optional(dev->dev, NULL); 109 107 if (IS_ERR(dev->reset)) { 110 108 err = PTR_ERR(dev->reset); 109 + if (err != -EPROBE_DEFER) 110 + dev_err(dev->dev, "get reset controller failed %d\n", 111 + err); 111 112 goto error_out1; 112 113 } else if (dev->reset != NULL) { 113 114 err = reset_control_deassert(dev->reset); 114 - if (err) 115 + if (err) { 116 + dev_err(dev->dev, 117 + "reset controller deassert failed %d\n", err); 115 118 goto error_out1; 119 + } 116 120 } 117 121 118 122 return 0; ··· 295 287 dma_set_coherent_mask(ldev->dev, DMA_BIT_MASK(32)); 296 288 297 289 err = lima_clk_init(ldev); 298 - if (err) { 299 - dev_err(ldev->dev, "clk init fail %d\n", err); 290 + if (err) 300 291 return err; 301 - } 302 292 303 293 err = lima_regulator_init(ldev); 304 294 if (err)