diff options
| -rw-r--r-- | drivers/clk/mmp/clk-mix.c | 4 | ||||
| -rw-r--r-- | drivers/clk/mmp/clk-mmp2.c | 6 | ||||
| -rw-r--r-- | drivers/clk/mmp/clk-pxa168.c | 6 | ||||
| -rw-r--r-- | drivers/clk/mmp/clk-pxa910.c | 8 |
4 files changed, 12 insertions, 12 deletions
diff --git a/drivers/clk/mmp/clk-mix.c b/drivers/clk/mmp/clk-mix.c index b2471fb369f1..90814b2613c0 100644 --- a/drivers/clk/mmp/clk-mix.c +++ b/drivers/clk/mmp/clk-mix.c | |||
| @@ -229,7 +229,7 @@ static int mmp_clk_mix_determine_rate(struct clk_hw *hw, | |||
| 229 | parent_rate = clk_hw_get_rate(parent); | 229 | parent_rate = clk_hw_get_rate(parent); |
| 230 | mix_rate = parent_rate / item->divisor; | 230 | mix_rate = parent_rate / item->divisor; |
| 231 | gap = abs(mix_rate - req->rate); | 231 | gap = abs(mix_rate - req->rate); |
| 232 | if (parent_best == NULL || gap < gap_best) { | 232 | if (!parent_best || gap < gap_best) { |
| 233 | parent_best = parent; | 233 | parent_best = parent; |
| 234 | parent_rate_best = parent_rate; | 234 | parent_rate_best = parent_rate; |
| 235 | mix_rate_best = mix_rate; | 235 | mix_rate_best = mix_rate; |
| @@ -247,7 +247,7 @@ static int mmp_clk_mix_determine_rate(struct clk_hw *hw, | |||
| 247 | div = _get_div(mix, j); | 247 | div = _get_div(mix, j); |
| 248 | mix_rate = parent_rate / div; | 248 | mix_rate = parent_rate / div; |
| 249 | gap = abs(mix_rate - req->rate); | 249 | gap = abs(mix_rate - req->rate); |
| 250 | if (parent_best == NULL || gap < gap_best) { | 250 | if (!parent_best || gap < gap_best) { |
| 251 | parent_best = parent; | 251 | parent_best = parent; |
| 252 | parent_rate_best = parent_rate; | 252 | parent_rate_best = parent_rate; |
| 253 | mix_rate_best = mix_rate; | 253 | mix_rate_best = mix_rate; |
diff --git a/drivers/clk/mmp/clk-mmp2.c b/drivers/clk/mmp/clk-mmp2.c index 038023483b98..7460031714da 100644 --- a/drivers/clk/mmp/clk-mmp2.c +++ b/drivers/clk/mmp/clk-mmp2.c | |||
| @@ -83,19 +83,19 @@ void __init mmp2_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys, | |||
| 83 | void __iomem *apbc_base; | 83 | void __iomem *apbc_base; |
| 84 | 84 | ||
| 85 | mpmu_base = ioremap(mpmu_phys, SZ_4K); | 85 | mpmu_base = ioremap(mpmu_phys, SZ_4K); |
| 86 | if (mpmu_base == NULL) { | 86 | if (!mpmu_base) { |
| 87 | pr_err("error to ioremap MPMU base\n"); | 87 | pr_err("error to ioremap MPMU base\n"); |
| 88 | return; | 88 | return; |
| 89 | } | 89 | } |
| 90 | 90 | ||
| 91 | apmu_base = ioremap(apmu_phys, SZ_4K); | 91 | apmu_base = ioremap(apmu_phys, SZ_4K); |
| 92 | if (apmu_base == NULL) { | 92 | if (!apmu_base) { |
| 93 | pr_err("error to ioremap APMU base\n"); | 93 | pr_err("error to ioremap APMU base\n"); |
| 94 | return; | 94 | return; |
| 95 | } | 95 | } |
| 96 | 96 | ||
| 97 | apbc_base = ioremap(apbc_phys, SZ_4K); | 97 | apbc_base = ioremap(apbc_phys, SZ_4K); |
| 98 | if (apbc_base == NULL) { | 98 | if (!apbc_base) { |
| 99 | pr_err("error to ioremap APBC base\n"); | 99 | pr_err("error to ioremap APBC base\n"); |
| 100 | return; | 100 | return; |
| 101 | } | 101 | } |
diff --git a/drivers/clk/mmp/clk-pxa168.c b/drivers/clk/mmp/clk-pxa168.c index a9ef9209532a..8e2551ab8462 100644 --- a/drivers/clk/mmp/clk-pxa168.c +++ b/drivers/clk/mmp/clk-pxa168.c | |||
| @@ -75,19 +75,19 @@ void __init pxa168_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys, | |||
| 75 | void __iomem *apbc_base; | 75 | void __iomem *apbc_base; |
| 76 | 76 | ||
| 77 | mpmu_base = ioremap(mpmu_phys, SZ_4K); | 77 | mpmu_base = ioremap(mpmu_phys, SZ_4K); |
| 78 | if (mpmu_base == NULL) { | 78 | if (!mpmu_base) { |
| 79 | pr_err("error to ioremap MPMU base\n"); | 79 | pr_err("error to ioremap MPMU base\n"); |
| 80 | return; | 80 | return; |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | apmu_base = ioremap(apmu_phys, SZ_4K); | 83 | apmu_base = ioremap(apmu_phys, SZ_4K); |
| 84 | if (apmu_base == NULL) { | 84 | if (!apmu_base) { |
| 85 | pr_err("error to ioremap APMU base\n"); | 85 | pr_err("error to ioremap APMU base\n"); |
| 86 | return; | 86 | return; |
| 87 | } | 87 | } |
| 88 | 88 | ||
| 89 | apbc_base = ioremap(apbc_phys, SZ_4K); | 89 | apbc_base = ioremap(apbc_phys, SZ_4K); |
| 90 | if (apbc_base == NULL) { | 90 | if (!apbc_base) { |
| 91 | pr_err("error to ioremap APBC base\n"); | 91 | pr_err("error to ioremap APBC base\n"); |
| 92 | return; | 92 | return; |
| 93 | } | 93 | } |
diff --git a/drivers/clk/mmp/clk-pxa910.c b/drivers/clk/mmp/clk-pxa910.c index a520cf7702a1..7a7965141918 100644 --- a/drivers/clk/mmp/clk-pxa910.c +++ b/drivers/clk/mmp/clk-pxa910.c | |||
| @@ -74,25 +74,25 @@ void __init pxa910_clk_init(phys_addr_t mpmu_phys, phys_addr_t apmu_phys, | |||
| 74 | void __iomem *apbc_base; | 74 | void __iomem *apbc_base; |
| 75 | 75 | ||
| 76 | mpmu_base = ioremap(mpmu_phys, SZ_4K); | 76 | mpmu_base = ioremap(mpmu_phys, SZ_4K); |
| 77 | if (mpmu_base == NULL) { | 77 | if (!mpmu_base) { |
| 78 | pr_err("error to ioremap MPMU base\n"); | 78 | pr_err("error to ioremap MPMU base\n"); |
| 79 | return; | 79 | return; |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | apmu_base = ioremap(apmu_phys, SZ_4K); | 82 | apmu_base = ioremap(apmu_phys, SZ_4K); |
| 83 | if (apmu_base == NULL) { | 83 | if (!apmu_base) { |
| 84 | pr_err("error to ioremap APMU base\n"); | 84 | pr_err("error to ioremap APMU base\n"); |
| 85 | return; | 85 | return; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | apbcp_base = ioremap(apbcp_phys, SZ_4K); | 88 | apbcp_base = ioremap(apbcp_phys, SZ_4K); |
| 89 | if (apbcp_base == NULL) { | 89 | if (!apbcp_base) { |
| 90 | pr_err("error to ioremap APBC extension base\n"); | 90 | pr_err("error to ioremap APBC extension base\n"); |
| 91 | return; | 91 | return; |
| 92 | } | 92 | } |
| 93 | 93 | ||
| 94 | apbc_base = ioremap(apbc_phys, SZ_4K); | 94 | apbc_base = ioremap(apbc_phys, SZ_4K); |
| 95 | if (apbc_base == NULL) { | 95 | if (!apbc_base) { |
| 96 | pr_err("error to ioremap APBC base\n"); | 96 | pr_err("error to ioremap APBC base\n"); |
| 97 | return; | 97 | return; |
| 98 | } | 98 | } |
