iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regmap: use IS_ERR() to check clk_get() results

Browse Source 
clk_get() returns an error pointer, or a valid token to pass back to the
clock API. Hence, the result must be checked with IS_ERR(), not by
comparison against NULL.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
This commit is contained in:
Stephen Warren 2013-11-25 15:12:47 -07:00 committed by Mark Brown
parent 6ce4eac1f6
commit 6b8e090ecc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/base/regmap/regmap-mmio.c
View File

@ -40,7 +40,7 @@ static int regmap_mmio_gather_write(void *context,
BUG_ON(reg_size != 4); BUG_ON(reg_size != 4);
if (ctx->clk) { if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk); ret = clk_enable(ctx->clk);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -73,7 +73,7 @@ static int regmap_mmio_gather_write(void *context,
offset += ctx->val_bytes; offset += ctx->val_bytes;
} }
if (ctx->clk) if (!IS_ERR(ctx->clk))
clk_disable(ctx->clk); clk_disable(ctx->clk);
return 0; return 0;
@ -96,7 +96,7 @@ static int regmap_mmio_read(void *context,
BUG_ON(reg_size != 4); BUG_ON(reg_size != 4);
if (ctx->clk) { if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk); ret = clk_enable(ctx->clk);
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -129,7 +129,7 @@ static int regmap_mmio_read(void *context,
offset += ctx->val_bytes; offset += ctx->val_bytes;
} }
if (ctx->clk) if (!IS_ERR(ctx->clk))
clk_disable(ctx->clk); clk_disable(ctx->clk);
return 0; return 0;
@ -139,7 +139,7 @@ static void regmap_mmio_free_context(void *context)
{ {
struct regmap_mmio_context *ctx = context; struct regmap_mmio_context *ctx = context;
if (ctx->clk) { if (!IS_ERR(ctx->clk)) {
clk_unprepare(ctx->clk); clk_unprepare(ctx->clk);
clk_put(ctx->clk); clk_put(ctx->clk);
} }
@ -209,6 +209,7 @@ static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev,
ctx->regs = regs; ctx->regs = regs;
ctx->val_bytes = config->val_bits / 8; ctx->val_bytes = config->val_bits / 8;
ctx->clk = ERR_PTR(-ENODEV);
if (clk_id == NULL) if (clk_id == NULL)
return ctx; return ctx;