CHROMIUM: MALI: Don't log error on EPROBE_DEFER.
When the error is EPROBE_DEFER, the probe would be retried later. Don't
log error in this case.
BUG=b:123206924
TEST=manually
Change-Id: I53fd0b6bb1d95d381c686b7ae8393cb0a3e33569
Signed-off-by: Pi-Hsun Shih <pihsun@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1429317
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Anders Pedersen <anders.pedersen@arm.corp-partner.google.com>
Reviewed-by: John Reitan <john.reitan@arm.corp-partner.google.com>
Reviewed-by: John Einar Reitan <john.reitan@arm.com>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>
diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index cc7b94f..18fdafb 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -3775,7 +3775,9 @@
err = kbase_backend_early_init(kbdev);
if (err) {
- dev_err(kbdev->dev, "Early backend initialization failed\n");
+ if (err != -EPROBE_DEFER)
+ dev_err(kbdev->dev,
+ "Early backend initialization failed\n");
kbase_platform_device_remove(pdev);
return err;
}
diff --git a/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c b/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c
index a18ae2c..7e746c5 100644
--- a/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c
+++ b/drivers/gpu/arm/midgard/platform/mediatek/mali_kbase_runtime_pm.c
@@ -232,11 +232,8 @@
int err = 0, i;
unsigned long volt;
- if (!probe_gpu_core1_dev || !probe_gpu_core2_dev) {
- dev_err(kbdev->dev,
- "Wait for other power domain ret: %d\n", -EPROBE_DEFER);
+ if (!probe_gpu_core1_dev || !probe_gpu_core2_dev)
return -EPROBE_DEFER;
- }
for (i = 0; i < kbdev->regulator_num; i++)
if (kbdev->regulator[i] == NULL)
