From: Devendra Naga Date: Thu, 12 Jul 2012 06:13:37 +0000 (+0545) Subject: UPSTREAM: staging/gdm72xx: use kzalloc for phydev and sdev X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=2eb240b9b022f6e4b5e3f448e14bfac3565c6527;p=cascardo%2Flinux.git UPSTREAM: staging/gdm72xx: use kzalloc for phydev and sdev in sdio probe function we are doing kmalloc which can be done using kzalloc. Signed-off-by: Devendra Naga Signed-off-by: Greg Kroah-Hartman (cherry picked from commit c2a1793d1b2dedd3dfc33af00c6b1d4f050c040c) Change-Id: I1cb958de85e1b249ec56af55cc05e9729d9e9388 Signed-off-by: Ben Chan Reviewed-on: https://gerrit.chromium.org/gerrit/28219 Reviewed-by: Olof Johansson --- diff --git a/drivers/staging/gdm72xx/gdm_sdio.c b/drivers/staging/gdm72xx/gdm_sdio.c index 5e19b09e3bff..3e43c012ef27 100644 --- a/drivers/staging/gdm72xx/gdm_sdio.c +++ b/drivers/staging/gdm72xx/gdm_sdio.c @@ -664,20 +664,17 @@ static int sdio_wimax_probe(struct sdio_func *func, if (ret) return ret; - phy_dev = kmalloc(sizeof(*phy_dev), GFP_KERNEL); + phy_dev = kzalloc(sizeof(*phy_dev), GFP_KERNEL); if (phy_dev == NULL) { ret = -ENOMEM; goto out; } - sdev = kmalloc(sizeof(*sdev), GFP_KERNEL); + sdev = kzalloc(sizeof(*sdev), GFP_KERNEL); if (sdev == NULL) { ret = -ENOMEM; goto out; } - memset(phy_dev, 0, sizeof(*phy_dev)); - memset(sdev, 0, sizeof(*sdev)); - phy_dev->priv_dev = (void *)sdev; phy_dev->send_func = gdm_sdio_send; phy_dev->rcv_func = gdm_sdio_receive;