6 files changed, 25 insertions, 23 deletions

diff --git a/drivers/base/regmap/regcache-flat.c b/drivers/base/regmap/regcache-flat.c
index 0246f44ded74..686c9e0b930e 100644
--- a/drivers/base/regmap/regcache-flat.c
+++ b/drivers/base/regmap/regcache-flat.c
@@ -21,7 +21,7 @@ static int regcache_flat_init(struct regmap *map)
         int i;
         unsigned int *cache;
 
-        map->cache = kzalloc(sizeof(unsigned int) * (map->max_register + 1),
+        map->cache = kcalloc(map->max_register + 1, sizeof(unsigned int),
                              GFP_KERNEL);
         if (!map->cache)
                 return -ENOMEM;
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 736e0d378567..6f77d7319fc6 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -139,7 +139,7 @@ static int regcache_lzo_init(struct regmap *map)
         ret = 0;
 
         blkcount = regcache_lzo_block_count(map);
-        map->cache = kzalloc(blkcount * sizeof *lzo_blocks,
+        map->cache = kcalloc(blkcount, sizeof(*lzo_blocks),
                              GFP_KERNEL);
         if (!map->cache)
                 return -ENOMEM;
@@ -152,8 +152,8 @@ static int regcache_lzo_init(struct regmap *map)
          * that register.
          */
         bmp_size = map->num_reg_defaults_raw;
-        sync_bmp = kmalloc(BITS_TO_LONGS(bmp_size) * sizeof(long),
-                           GFP_KERNEL);
+        sync_bmp = kmalloc_array(BITS_TO_LONGS(bmp_size), sizeof(long),
+                                 GFP_KERNEL);
         if (!sync_bmp) {
                 ret = -ENOMEM;
                 goto err;
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 56486d92c4e7..9d7ced559cba 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -361,13 +361,14 @@ regcache_rbtree_node_alloc(struct regmap *map, unsigned int reg)
                 rbnode->base_reg = reg;
         }
 
-        rbnode->block = kmalloc(rbnode->blklen * map->cache_word_size,
-                                GFP_KERNEL);
+        rbnode->block = kmalloc_array(rbnode->blklen, map->cache_word_size,
+                                      GFP_KERNEL);
         if (!rbnode->block)
                 goto err_free;
 
-        rbnode->cache_present = kzalloc(BITS_TO_LONGS(rbnode->blklen) *
-                sizeof(*rbnode->cache_present), GFP_KERNEL);
+        rbnode->cache_present = kcalloc(BITS_TO_LONGS(rbnode->blklen),
+                                        sizeof(*rbnode->cache_present),
+                                        GFP_KERNEL);
         if (!rbnode->cache_present)
                 goto err_free_block;
 
diff --git a/drivers/base/regmap/regmap-irq.c b/drivers/base/regmap/regmap-irq.c
index 8d16db533527..4d2cb21254aa 100644
--- a/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@ -386,23 +386,23 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
         if (!d)
                 return -ENOMEM;
 
-        d->status_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,
+        d->status_buf = kcalloc(chip->num_regs, sizeof(unsigned int),
                                 GFP_KERNEL);
         if (!d->status_buf)
                 goto err_alloc;
 
-        d->mask_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,
+        d->mask_buf = kcalloc(chip->num_regs, sizeof(unsigned int),
                               GFP_KERNEL);
         if (!d->mask_buf)
                 goto err_alloc;
 
-        d->mask_buf_def = kzalloc(sizeof(unsigned int) * chip->num_regs,
+        d->mask_buf_def = kcalloc(chip->num_regs, sizeof(unsigned int),
                                   GFP_KERNEL);
         if (!d->mask_buf_def)
                 goto err_alloc;
 
         if (chip->wake_base) {
-                d->wake_buf = kzalloc(sizeof(unsigned int) * chip->num_regs,
+                d->wake_buf = kcalloc(chip->num_regs, sizeof(unsigned int),
                                       GFP_KERNEL);
                 if (!d->wake_buf)
                         goto err_alloc;
@@ -422,8 +422,9 @@ int regmap_add_irq_chip(struct regmap *map, int irq, int irq_flags,
 
         if (!map->use_single_read && map->reg_stride == 1 &&
             d->irq_reg_stride == 1) {
-                d->status_reg_buf = kmalloc(map->format.val_bytes *
-                                            chip->num_regs, GFP_KERNEL);
+                d->status_reg_buf = kmalloc_array(chip->num_regs,
+                                                  map->format.val_bytes,
+                                                  GFP_KERNEL);
                 if (!d->status_reg_buf)
                         goto err_alloc;
         }
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 4ac63c0e50c7..a8f6dd9457be 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -1513,7 +1513,7 @@ int regmap_write(struct regmap *map, unsigned int reg, unsigned int val)
 {
         int ret;
 
-        if (reg % map->reg_stride)
+        if (!IS_ALIGNED(reg, map->reg_stride))
                 return -EINVAL;
 
         map->lock(map->lock_arg);
@@ -1540,7 +1540,7 @@ int regmap_write_async(struct regmap *map, unsigned int reg, unsigned int val)
 {
         int ret;
 
-        if (reg % map->reg_stride)
+        if (!IS_ALIGNED(reg, map->reg_stride))
                 return -EINVAL;
 
         map->lock(map->lock_arg);
@@ -1714,7 +1714,7 @@ int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
 
         if (map->bus && !map->format.parse_inplace)
                 return -EINVAL;
-        if (reg % map->reg_stride)
+        if (!IS_ALIGNED(reg, map->reg_stride))
                 return -EINVAL;
 
         /*
@@ -1983,7 +1983,7 @@ static int _regmap_multi_reg_write(struct regmap *map,
                         int reg = regs[i].reg;
                         if (!map->writeable_reg(map->dev, reg))
                                 return -EINVAL;
-                        if (reg % map->reg_stride)
+                        if (!IS_ALIGNED(reg, map->reg_stride))
                                 return -EINVAL;
                 }
 
@@ -2133,7 +2133,7 @@ int regmap_raw_write_async(struct regmap *map, unsigned int reg,
 
         if (val_len % map->format.val_bytes)
                 return -EINVAL;
-        if (reg % map->reg_stride)
+        if (!IS_ALIGNED(reg, map->reg_stride))
                 return -EINVAL;
 
         map->lock(map->lock_arg);
@@ -2260,7 +2260,7 @@ int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val)
 {
         int ret;
 
-        if (reg % map->reg_stride)
+        if (!IS_ALIGNED(reg, map->reg_stride))
                 return -EINVAL;
 
         map->lock(map->lock_arg);
@@ -2296,7 +2296,7 @@ int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
                 return -EINVAL;
         if (val_len % map->format.val_bytes)
                 return -EINVAL;
-        if (reg % map->reg_stride)
+        if (!IS_ALIGNED(reg, map->reg_stride))
                 return -EINVAL;
         if (val_count == 0)
                 return -EINVAL;
@@ -2414,7 +2414,7 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
         size_t val_bytes = map->format.val_bytes;
         bool vol = regmap_volatile_range(map, reg, val_count);
 
-        if (reg % map->reg_stride)
+        if (!IS_ALIGNED(reg, map->reg_stride))
                 return -EINVAL;
 
         if (map->bus && map->format.parse_inplace && (vol || map->cache_type == REGCACHE_NONE)) {
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index d68bb402120e..4d9a1a04647b 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -1021,7 +1021,7 @@ static inline void regmap_async_complete(struct regmap *map)
 }
 
 static inline int regmap_register_patch(struct regmap *map,
-                                        const struct reg_default *regs,
+                                        const struct reg_sequence *regs,
                                         int num_regs)
 {
         WARN_ONCE(1, "regmap API is disabled");