]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
clk: mmp: Adjust checks for NULL pointers
authorMarkus Elfring <elfring@users.sourceforge.net>
Wed, 27 Sep 2017 07:00:21 +0000 (09:00 +0200)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 14 Nov 2017 01:41:17 +0000 (17:41 -0800)
The script “checkpatch.pl” pointed information out like the
following:

Comparison to NULL could be written !...

Thus fix the affected source code places.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
drivers/clk/mmp/clk-mix.c
drivers/clk/mmp/clk-mmp2.c
drivers/clk/mmp/clk-pxa168.c
drivers/clk/mmp/clk-pxa910.c

index b2471fb369f19d7c34b2051e02df4fcdefc396f5..90814b2613c0c2c4e01a1b39b186ee06d1efbcc1 100644 (file)
@@ -229,7 +229,7 @@ static int mmp_clk_mix_determine_rate(struct clk_hw *hw,
                        parent_rate = clk_hw_get_rate(parent);
                        mix_rate = parent_rate / item->divisor;
                        gap = abs(mix_rate - req->rate);
-                       if (parent_best == NULL || gap < gap_best) {
+                       if (!parent_best || gap < gap_best) {
                                parent_best = parent;
                                parent_rate_best = parent_rate;
                                mix_rate_best = mix_rate;
@@ -247,7 +247,7 @@ static int mmp_clk_mix_determine_rate(struct clk_hw *hw,
                                div = _get_div(mix, j);
                                mix_rate = parent_rate / div;
                                gap = abs(mix_rate - req->rate);
-                               if (parent_best == NULL || gap < gap_best) {
+                               if (!parent_best || gap < gap_best) {
                                        parent_best = parent;
                                        parent_rate_best = parent_rate;
                                        mix_rate_best = mix_rate;
index 038023483b98fe1f4d2cbed08f8a6525e7360d53..7460031714da970569aee9209279b62953cdfa5d 100644 (file)
@@ -83,19 +83,19 @@ void __init mmp2_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
        void __iomem *apbc_base;
 
        mpmu_base = ioremap(mpmu_phys, SZ_4K);
-       if (mpmu_base == NULL) {
+       if (!mpmu_base) {
                pr_err("error to ioremap MPMU base\n");
                return;
        }
 
        apmu_base = ioremap(apmu_phys, SZ_4K);
-       if (apmu_base == NULL) {
+       if (!apmu_base) {
                pr_err("error to ioremap APMU base\n");
                return;
        }
 
        apbc_base = ioremap(apbc_phys, SZ_4K);
-       if (apbc_base == NULL) {
+       if (!apbc_base) {
                pr_err("error to ioremap APBC base\n");
                return;
        }
index a9ef9209532aa66605c1eca9de7b1f74d52ae09c..8e2551ab846251ce4bdd0b4e13fc70e832db4782 100644 (file)
@@ -75,19 +75,19 @@ void __init pxa168_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
        void __iomem *apbc_base;
 
        mpmu_base = ioremap(mpmu_phys, SZ_4K);
-       if (mpmu_base == NULL) {
+       if (!mpmu_base) {
                pr_err("error to ioremap MPMU base\n");
                return;
        }
 
        apmu_base = ioremap(apmu_phys, SZ_4K);
-       if (apmu_base == NULL) {
+       if (!apmu_base) {
                pr_err("error to ioremap APMU base\n");
                return;
        }
 
        apbc_base = ioremap(apbc_phys, SZ_4K);
-       if (apbc_base == NULL) {
+       if (!apbc_base) {
                pr_err("error to ioremap APBC base\n");
                return;
        }
index a520cf7702a11649fe14581a59cdb063c859b461..7a79651419183dfa044bcd8ccfd69d87953ce810 100644 (file)
@@ -74,25 +74,25 @@ void __init pxa910_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys,
        void __iomem *apbc_base;
 
        mpmu_base = ioremap(mpmu_phys, SZ_4K);
-       if (mpmu_base == NULL) {
+       if (!mpmu_base) {
                pr_err("error to ioremap MPMU base\n");
                return;
        }
 
        apmu_base = ioremap(apmu_phys, SZ_4K);
-       if (apmu_base == NULL) {
+       if (!apmu_base) {
                pr_err("error to ioremap APMU base\n");
                return;
        }
 
        apbcp_base = ioremap(apbcp_phys, SZ_4K);
-       if (apbcp_base == NULL) {
+       if (!apbcp_base) {
                pr_err("error to ioremap APBC extension base\n");
                return;
        }
 
        apbc_base = ioremap(apbc_phys, SZ_4K);
-       if (apbc_base == NULL) {
+       if (!apbc_base) {
                pr_err("error to ioremap APBC base\n");
                return;
        }