1 files changed, 14 insertions, 10 deletions

diff --git a/drivers/extcon/extcon.c b/drivers/extcon/extcon.c
index 8bff5fd18185..af83ad58819c 100644
--- a/drivers/extcon/extcon.c
+++ b/drivers/extcon/extcon.c
@@ -1126,8 +1126,9 @@ int extcon_dev_register(struct extcon_dev *edev)
                 char *str;
                 struct extcon_cable *cable;
 
-                edev->cables = kzalloc(sizeof(struct extcon_cable) *
-                                       edev->max_supported, GFP_KERNEL);
+                edev->cables = kcalloc(edev->max_supported,
+                                       sizeof(struct extcon_cable),
+                                       GFP_KERNEL);
                 if (!edev->cables) {
                         ret = -ENOMEM;
                         goto err_sysfs_alloc;
@@ -1136,7 +1137,7 @@ int extcon_dev_register(struct extcon_dev *edev)
                         cable = &edev->cables[index];
 
                         snprintf(buf, 10, "cable.%d", index);
-                        str = kzalloc(sizeof(char) * (strlen(buf) + 1),
+                        str = kzalloc(strlen(buf) + 1,
                                       GFP_KERNEL);
                         if (!str) {
                                 for (index--; index >= 0; index--) {
@@ -1177,15 +1178,17 @@ int extcon_dev_register(struct extcon_dev *edev)
                 for (index = 0; edev->mutually_exclusive[index]; index++)
                         ;
 
-                edev->attrs_muex = kzalloc(sizeof(struct attribute *) *
-                                           (index + 1), GFP_KERNEL);
+                edev->attrs_muex = kcalloc(index + 1,
+                                           sizeof(struct attribute *),
+                                           GFP_KERNEL);
                 if (!edev->attrs_muex) {
                         ret = -ENOMEM;
                         goto err_muex;
                 }
 
-                edev->d_attrs_muex = kzalloc(sizeof(struct device_attribute) *
-                                             index, GFP_KERNEL);
+                edev->d_attrs_muex = kcalloc(index,
+                                             sizeof(struct device_attribute),
+                                             GFP_KERNEL);
                 if (!edev->d_attrs_muex) {
                         ret = -ENOMEM;
                         kfree(edev->attrs_muex);
@@ -1194,7 +1197,7 @@ int extcon_dev_register(struct extcon_dev *edev)
 
                 for (index = 0; edev->mutually_exclusive[index]; index++) {
                         sprintf(buf, "0x%x", edev->mutually_exclusive[index]);
-                        name = kzalloc(sizeof(char) * (strlen(buf) + 1),
+                        name = kzalloc(strlen(buf) + 1,
                                        GFP_KERNEL);
                         if (!name) {
                                 for (index--; index >= 0; index--) {
@@ -1220,8 +1223,9 @@ int extcon_dev_register(struct extcon_dev *edev)
 
         if (edev->max_supported) {
                 edev->extcon_dev_type.groups =
-                        kzalloc(sizeof(struct attribute_group *) *
-                                (edev->max_supported + 2), GFP_KERNEL);
+                        kcalloc(edev->max_supported + 2,
+                                sizeof(struct attribute_group *),
+                                GFP_KERNEL);
                 if (!edev->extcon_dev_type.groups) {
                         ret = -ENOMEM;
                         goto err_alloc_groups;