diff options
Diffstat (limited to 'drivers/base/regmap/regmap-mmio.c')
| -rw-r--r-- | drivers/base/regmap/regmap-mmio.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c index c8422ca46f..01b0a99631 100644 --- a/drivers/base/regmap/regmap-mmio.c +++ b/drivers/base/regmap/regmap-mmio.c @@ -7,7 +7,7 @@ #include <linux/clk.h> #include <linux/err.h> #include <io.h> -#include <regmap.h> +#include <linux/regmap.h> #include "internal.h" @@ -46,7 +46,7 @@ static int regmap_mmio_get_min_stride(size_t val_bits) case 8: /* The core treats 0 as 1 */ min_stride = 0; - return 0; + break; case 16: min_stride = 2; break; @@ -185,9 +185,9 @@ static const struct regmap_bus regmap_mmio = { .val_format_endian_default = REGMAP_ENDIAN_LITTLE, }; -static struct regmap_mmio_context *regmap_mmio_gen_context(struct device_d *dev, - void __iomem *regs, - const struct regmap_config *config) +static struct regmap_mmio_context *regmap_mmio_gen_context(struct device *dev, + void __iomem *regs, + const struct regmap_config *config) { struct regmap_mmio_context *ctx; int min_stride; @@ -277,7 +277,7 @@ err_free: return ERR_PTR(ret); } -struct regmap *regmap_init_mmio_clk(struct device_d *dev, +struct regmap *regmap_init_mmio_clk(struct device *dev, const char *clk_id, void __iomem *regs, const struct regmap_config *config) @@ -289,11 +289,15 @@ struct regmap *regmap_init_mmio_clk(struct device_d *dev, return ERR_CAST(ctx); if (clk_id) { - ctx->clk = clk_get(dev, clk_id); - if (IS_ERR(ctx->clk)) { + struct clk *clk; + + clk = clk_get(dev, clk_id); + if (IS_ERR(clk)) { kfree(ctx); - return ERR_CAST(ctx->clk); + return ERR_CAST(clk); } + + ctx->clk = clk; } return regmap_init(dev, ®map_mmio, ctx, config); |