commit 09dc799bceb512f3088cc6256b8707122c80221f
author Kevin Hilman <khilman@baylibre.com> Mon Apr 26 08:06:19 2021 -0700
committer Kevin Hilman <khilman@baylibre.com> Mon Apr 26 08:06:19 2021 -0700
tree 606751725eb6d5dc0b67e3ed32ea1b034c77523a
parent 53e08e7cff9117a59035e612ca3fc30c05c5406b
parent 2b6f8c82af6201b64b46937bd15aa389a72755d3

Merge branch 'v5.13/fixes' into tmp/aml-rebuild

* v5.13/fixes:
  soc: amlogic: meson-clk-measure: remove redundant dev_err call in meson_msr_probe()

drivers/soc/amlogic/meson-clk-measure.c

diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c
index e195747..6dd1902 100644
--- a/drivers/soc/amlogic/meson-clk-measure.c
+++ b/drivers/soc/amlogic/meson-clk-measure.c
@@ -626,10 +626,8 @@
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	base = devm_ioremap_resource(&pdev->dev, res);
-	if (IS_ERR(base)) {
-		dev_err(&pdev->dev, "io resource mapping failed\n");
+	if (IS_ERR(base))
 		return PTR_ERR(base);
-	}
 
 	priv->regmap = devm_regmap_init_mmio(&pdev->dev, base,
 					     &meson_clk_msr_regmap_config);