gpu: arm: midgard: r12p0_04rel0: Fix incorrect IS_ERR_OR_NULL() usage

The corresponding function return ERR_PTR() values which
should be tested with IS_ERR(), not IS_ERR_OR_NULL() macro.
Especially it is not correct to do:

 if(IS_ERR_OR_NULL(value))
	error = PTR_ERR(value);

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
[jy0922.shim: apply to midgard r12p0_04rel0 except r5p0_06rel0 part]
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>

diff --git a/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_devfreq.c b/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_devfreq.c
index 5457d993a9477bb45d4a59811a420c8d2d3cd479..badb337322d314f9840379e260ef4a16c5c9493e 100644 (file)
--- a/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_devfreq.c
+++ b/drivers/gpu/arm/midgard/r12p0_04rel0/backend/gpu/mali_kbase_devfreq.c
@@ -59,7 +59,7 @@ kbase_devfreq_target(struct device *dev, unsigned long *target_freq, u32 flags)
        opp = devfreq_recommended_opp(dev, &freq, flags);
        voltage = dev_pm_opp_get_voltage(opp);
        rcu_read_unlock();
-       if (IS_ERR_OR_NULL(opp)) {
+       if (IS_ERR(opp)) {
                dev_err(dev, "Failed to get opp (%ld)\n", PTR_ERR(opp));
                return PTR_ERR(opp);
        }
@@ -268,7 +268,7 @@ int kbase_devfreq_init(struct kbase_device *kbdev)
                                kbdev->dev->of_node,
                                kbdev->devfreq,
                                &power_model_simple_ops);
-               if (IS_ERR_OR_NULL(kbdev->devfreq_cooling)) {
+               if (IS_ERR(kbdev->devfreq_cooling)) {
                        err = PTR_ERR(kbdev->devfreq_cooling);
                        dev_err(kbdev->dev,
                                "Failed to register cooling device (%d)\n",

diff --git a/drivers/gpu/arm/midgard/r12p0_04rel0/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/r12p0_04rel0/mali_kbase_core_linux.c
index 19d4d775108b26221235acd9a180a6e12f1d5e09..3cc6214317cae12cb05b96e34ffc0e867b698390 100644 (file)
--- a/drivers/gpu/arm/midgard/r12p0_04rel0/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/r12p0_04rel0/mali_kbase_core_linux.c
@@ -3340,7 +3340,7 @@ static int power_control_init(struct platform_device *pdev)
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) && defined(CONFIG_OF) \
                        && defined(CONFIG_REGULATOR)
        kbdev->regulator = regulator_get_optional(kbdev->dev, "mali");
-       if (IS_ERR_OR_NULL(kbdev->regulator)) {
+       if (IS_ERR(kbdev->regulator)) {
                err = PTR_ERR(kbdev->regulator);
                kbdev->regulator = NULL;
                if (err == -EPROBE_DEFER) {
@@ -3361,7 +3361,7 @@ static int power_control_init(struct platform_device *pdev)
 #endif /* LINUX_VERSION_CODE >= 3, 12, 0 */
 
        kbdev->clock = clk_get(kbdev->dev, "clk_mali");
-       if (IS_ERR_OR_NULL(kbdev->clock)) {
+       if (IS_ERR(kbdev->clock)) {
                err = PTR_ERR(kbdev->clock);
                kbdev->clock = NULL;
                if (err == -EPROBE_DEFER) {