Merge tag 'hsi-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

Pull HSI updates from Sebastian Reichel:
 "Misc cleanups"

* tag 'hsi-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
  HSI: core: Use kcalloc() in two functions
  HSI: Use kcalloc() in hsi_register_board_info()
  HSI: omap_ssi: Delete an error message for a failed memory allocation in ssi_add_controller()
  HSI: omap_ssi: Fix a typo in a comment line
  HSI: omap_ssi: Use devm_kcalloc() in ssi_add_controller()
  HSI: nokia-modem: Add a space character for better code readability in nokia_modem_probe()
  HSI: nokia-modem: Delete error messages for a failed memory allocation in two functions
  HSI: nokia-modem: Use devm_kcalloc() in nokia_modem_gpio_probe()

4 files changed, 14 insertions, 20 deletions

diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c
index c000780d931f..f78cca98266f 100644
--- a/drivers/hsi/clients/nokia-modem.c
+++ b/drivers/hsi/clients/nokia-modem.c
@@ -102,12 +102,10 @@ static int nokia_modem_gpio_probe(struct device *dev)
                 return -EINVAL;
         }
 
-        modem->gpios = devm_kzalloc(dev, gpio_count *
-                                sizeof(struct nokia_modem_gpio), GFP_KERNEL);
-        if (!modem->gpios) {
-                dev_err(dev, "Could not allocate memory for gpios\n");
+        modem->gpios = devm_kcalloc(dev, gpio_count, sizeof(*modem->gpios),
+                                    GFP_KERNEL);
+        if (!modem->gpios)
                 return -ENOMEM;
-        }
 
         modem->gpio_amount = gpio_count;
 
@@ -156,10 +154,9 @@ static int nokia_modem_probe(struct device *dev)
         }
 
         modem = devm_kzalloc(dev, sizeof(*modem), GFP_KERNEL);
-        if (!modem) {
-                dev_err(dev, "Could not allocate memory for nokia_modem_device\n");
+        if (!modem)
                 return -ENOMEM;
-        }
+
         dev_set_drvdata(dev, modem);
         modem->device = dev;
 
@@ -182,7 +179,7 @@ static int nokia_modem_probe(struct device *dev)
         }
         enable_irq_wake(irq);
 
-        if(pm) {
+        if (pm) {
                 err = nokia_modem_gpio_probe(dev);
                 if (err < 0) {
                         dev_err(dev, "Could not probe GPIOs\n");
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c
index 9a29b34ed2c8..88e48b346916 100644
--- a/drivers/hsi/controllers/omap_ssi_core.c
+++ b/drivers/hsi/controllers/omap_ssi_core.c
@@ -384,10 +384,8 @@ static int ssi_add_controller(struct hsi_controller *ssi,
         int err;
 
         omap_ssi = devm_kzalloc(&ssi->device, sizeof(*omap_ssi), GFP_KERNEL);
-        if (!omap_ssi) {
-                dev_err(&pd->dev, "not enough memory for omap ssi\n");
+        if (!omap_ssi)
                 return -ENOMEM;
-        }
 
         err = ida_simple_get(&platform_omap_ssi_ida, 0, 0, GFP_KERNEL);
         if (err < 0)
@@ -421,8 +419,8 @@ static int ssi_add_controller(struct hsi_controller *ssi,
                 goto out_err;
         }
 
-        omap_ssi->port = devm_kzalloc(&ssi->device,
-                sizeof(struct omap_ssi_port *) * ssi->num_ports, GFP_KERNEL);
+        omap_ssi->port = devm_kcalloc(&ssi->device, ssi->num_ports,
+                                      sizeof(*omap_ssi->port), GFP_KERNEL);
         if (!omap_ssi->port) {
                 err = -ENOMEM;
                 goto out_err;
@@ -467,7 +465,7 @@ static int ssi_hw_init(struct hsi_controller *ssi)
                 dev_err(&ssi->device, "runtime PM failed %d\n", err);
                 return err;
         }
-        /* Reseting GDD */
+        /* Resetting GDD */
         writel_relaxed(SSI_SWRESET, omap_ssi->gdd + SSI_GDD_GRST_REG);
         /* Get FCK rate in KHz */
         omap_ssi->fck_rate = DIV_ROUND_CLOSEST(ssi_get_clk_rate(ssi), 1000);
diff --git a/drivers/hsi/hsi_boardinfo.c b/drivers/hsi/hsi_boardinfo.c
index e56bc6da5f98..e381cb4c962e 100644
--- a/drivers/hsi/hsi_boardinfo.c
+++ b/drivers/hsi/hsi_boardinfo.c
@@ -49,7 +49,7 @@ int __init hsi_register_board_info(struct hsi_board_info const *info,
 {
         struct hsi_cl_info *cl_info;
 
-        cl_info = kzalloc(sizeof(*cl_info) * len, GFP_KERNEL);
+        cl_info = kcalloc(len, sizeof(*cl_info), GFP_KERNEL);
         if (!cl_info)
                 return -ENOMEM;
 
diff --git a/drivers/hsi/hsi_core.c b/drivers/hsi/hsi_core.c
index c2a2a9795b0b..9065efd21851 100644
--- a/drivers/hsi/hsi_core.c
+++ b/drivers/hsi/hsi_core.c
@@ -267,14 +267,13 @@ static void hsi_add_client_from_dt(struct hsi_port *port,
 
         cl->rx_cfg.num_channels = cells;
         cl->tx_cfg.num_channels = cells;
-
-        cl->rx_cfg.channels = kzalloc(cells * sizeof(channel), GFP_KERNEL);
+        cl->rx_cfg.channels = kcalloc(cells, sizeof(channel), GFP_KERNEL);
         if (!cl->rx_cfg.channels) {
                 err = -ENOMEM;
                 goto err;
         }
 
-        cl->tx_cfg.channels = kzalloc(cells * sizeof(channel), GFP_KERNEL);
+        cl->tx_cfg.channels = kcalloc(cells, sizeof(channel), GFP_KERNEL);
         if (!cl->tx_cfg.channels) {
                 err = -ENOMEM;
                 goto err2;
@@ -485,7 +484,7 @@ struct hsi_controller *hsi_alloc_controller(unsigned int n_ports, gfp_t flags)
         hsi = kzalloc(sizeof(*hsi), flags);
         if (!hsi)
                 return NULL;
-        port = kzalloc(sizeof(*port)*n_ports, flags);
+        port = kcalloc(n_ports, sizeof(*port), flags);
         if (!port) {
                 kfree(hsi);
                 return NULL;