regmap: fix kcalloc() arguments order

When compiling with gcc version 14.0.0 20231220 (experimental)
and W=1, I've noticed a bunch of four similar warnings like:

drivers/base/regmap/regmap-ram.c: In function '__regmap_init_ram':
drivers/base/regmap/regmap-ram.c:68:37: warning: 'kcalloc' sizes specified with
'sizeof' in the earlier argument and not in the later argument [-Wcalloc-transposed-args]
   68 |         data->read = kcalloc(sizeof(bool), config->max_register + 1,
      |                                     ^~~~

Since 'n' and 'size' arguments of 'kcalloc()' are multiplied to
calculate the final size, their actual order doesn't affect the
result and so this is not a bug. But it's still worth to fix it.

Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Link: https://msgid.link/r/20231220175829.533700-1-dmantipov@yandex.ru
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/base/regmap/regmap-ram.c b/drivers/base/regmap/regmap-ram.c
index 85f34a5dee04e25647dc2c8c29008a2a04dd8ff0..192d6b131dff8e86cb6042d25fe2f759d433be37 100644 (file)
--- a/drivers/base/regmap/regmap-ram.c
+++ b/drivers/base/regmap/regmap-ram.c
@@ -65,12 +65,12 @@ struct regmap *__regmap_init_ram(const struct regmap_config *config,
                return ERR_PTR(-EINVAL);
        }
 
-       data->read = kcalloc(sizeof(bool), config->max_register + 1,
+       data->read = kcalloc(config->max_register + 1, sizeof(bool),
                             GFP_KERNEL);
        if (!data->read)
                return ERR_PTR(-ENOMEM);
 
-       data->written = kcalloc(sizeof(bool), config->max_register + 1,
+       data->written = kcalloc(config->max_register + 1, sizeof(bool),
                                GFP_KERNEL);
        if (!data->written)
                return ERR_PTR(-ENOMEM);

diff --git a/drivers/base/regmap/regmap-raw-ram.c b/drivers/base/regmap/regmap-raw-ram.c
index 463adafa9532c2b38882648ee0bfbe4e50cf7b56..93ae07b503fda191b1ed6e7b7b42082e3664831b 100644 (file)
--- a/drivers/base/regmap/regmap-raw-ram.c
+++ b/drivers/base/regmap/regmap-raw-ram.c
@@ -122,12 +122,12 @@ struct regmap *__regmap_init_raw_ram(const struct regmap_config *config,
                return ERR_PTR(-EINVAL);
        }
 
-       data->read = kcalloc(sizeof(bool), config->max_register + 1,
+       data->read = kcalloc(config->max_register + 1, sizeof(bool),
                             GFP_KERNEL);
        if (!data->read)
                return ERR_PTR(-ENOMEM);
 
-       data->written = kcalloc(sizeof(bool), config->max_register + 1,
+       data->written = kcalloc(config->max_register + 1, sizeof(bool),
                                GFP_KERNEL);
        if (!data->written)
                return ERR_PTR(-ENOMEM);