uwb: use kcalloc where appropriate

Signed-off-by: David Vrabel <david.vrabel@csr.com>

diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c
index e5390b7..7690728 100644 (file)
--- a/drivers/usb/wusbcore/mmc.c
+++ b/drivers/usb/wusbcore/mmc.c
@@ -43,7 +43,7 @@
 int wusbhc_mmcie_create(struct wusbhc *wusbhc)
 {
        u8 mmcies = wusbhc->mmcies_max;
-       wusbhc->mmcie = kzalloc(mmcies * sizeof(wusbhc->mmcie[0]), GFP_KERNEL);
+       wusbhc->mmcie = kcalloc(mmcies, sizeof(wusbhc->mmcie[0]), GFP_KERNEL);
        if (wusbhc->mmcie == NULL)
                return -ENOMEM;
        mutex_init(&wusbhc->mmcie_mutex);

diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c
index 7d192f3..c038635 100644 (file)
--- a/drivers/usb/wusbcore/wa-xfer.c
+++ b/drivers/usb/wusbcore/wa-xfer.c
@@ -674,7 +674,7 @@ static int __wa_xfer_setup_segs(struct wa_xfer *xfer, size_t xfer_hdr_size)
        size_t buf_itr, buf_size, buf_itr_size;
 
        result = -ENOMEM;
-       xfer->seg = kzalloc(xfer->segs * sizeof(xfer->seg[0]), GFP_ATOMIC);
+       xfer->seg = kcalloc(xfer->segs, sizeof(xfer->seg[0]), GFP_ATOMIC);
        if (xfer->seg == NULL)
                goto error_segs_kzalloc;
        buf_itr = 0;

diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c
index a6cb8ad..15f856c 100644 (file)
--- a/drivers/uwb/lc-dev.c
+++ b/drivers/uwb/lc-dev.c
@@ -443,7 +443,7 @@ void uwbd_dev_onair(struct uwb_rc *rc, struct uwb_beca_e *bce)
 
        uwb_mac_addr_print(macbuf, sizeof(macbuf), bce->mac_addr);
        uwb_dev_addr_print(devbuf, sizeof(devbuf), &bce->dev_addr);
-       uwb_dev = kcalloc(1, sizeof(*uwb_dev), GFP_KERNEL);
+       uwb_dev = kzalloc(sizeof(struct uwb_dev), GFP_KERNEL);
        if (uwb_dev == NULL) {
                dev_err(dev, "new device %s: Cannot allocate memory\n",
                        macbuf);