[PATCH 1/2] regmap: mmio: add regmap_mmio_{regsize, count}_check.

From: Xiubo Li
Date: Thu Mar 27 2014 - 01:25:25 EST


Signed-off-by: Xiubo Li <Li.Xiubo@xxxxxxxxxxxxx>
---
drivers/base/regmap/regmap-mmio.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 81f9775..4f1efce 100644
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -30,6 +30,16 @@ struct regmap_mmio_context {
struct clk *clk;
};

+static inline void regmap_mmio_regsize_check(size_t reg_size)
+{
+ BUG_ON(reg_size != 4);
+}
+
+static inline void regmap_mmio_count_check(size_t count)
+{
+ BUG_ON(count < 4);
+}
+
static int regmap_mmio_gather_write(void *context,
const void *reg, size_t reg_size,
const void *val, size_t val_size)
@@ -38,7 +48,7 @@ static int regmap_mmio_gather_write(void *context,
u32 offset;
int ret;

- BUG_ON(reg_size != 4);
+ regmap_mmio_regsize_check(reg_size);

if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk);
@@ -81,7 +91,7 @@ static int regmap_mmio_gather_write(void *context,

static int regmap_mmio_write(void *context, const void *data, size_t count)
{
- BUG_ON(count < 4);
+ regmap_mmio_count_check(count);

return regmap_mmio_gather_write(context, data, 4, data + 4, count - 4);
}
@@ -94,7 +104,7 @@ static int regmap_mmio_read(void *context,
u32 offset;
int ret;

- BUG_ON(reg_size != 4);
+ regmap_mmio_regsize_check(reg_size);

if (!IS_ERR(ctx->clk)) {
ret = clk_enable(ctx->clk);
--
1.8.4


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/