wifi: brcm80211: use sizeof(*pointer) instead of sizeof(type)

It is preferred to use sizeof(*pointer) instead of sizeof(type)
due to the type of the variable can change and one needs not
change the former (unlike the latter). This patch has no effect
on runtime behavior.

At the same time remove some redundant NULL initializations.

Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Erick Archer <erick.archer@outlook.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/AS8PR02MB7237FF1C2E880D1231684D708BF02@AS8PR02MB7237.eurprd02.prod.outlook.com

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
index 00679a990e3dac9bc9b71c0941a737ec0338ccc4..32f6b9d419d42991642e9142384278176cf6ea3b 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
@@ -1061,10 +1061,10 @@ static int brcmf_ops_sdio_probe(struct sdio_func *func,
        if (func->num != 2)
                return -ENODEV;
 
-       bus_if = kzalloc(sizeof(struct brcmf_bus), GFP_KERNEL);
+       bus_if = kzalloc(sizeof(*bus_if), GFP_KERNEL);
        if (!bus_if)
                return -ENOMEM;
-       sdiodev = kzalloc(sizeof(struct brcmf_sdio_dev), GFP_KERNEL);
+       sdiodev = kzalloc(sizeof(*sdiodev), GFP_KERNEL);
        if (!sdiodev) {
                kfree(bus_if);
                return -ENOMEM;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
index 7ea2631b80692dc50479f0abb753f85254835748..0c3d119d12199c9ef2507d2bc87a6ae838ec6486 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/btcoex.c
@@ -358,10 +358,10 @@ idle:
  */
 int brcmf_btcoex_attach(struct brcmf_cfg80211_info *cfg)
 {
-       struct brcmf_btcoex_info *btci = NULL;
+       struct brcmf_btcoex_info *btci;
        brcmf_dbg(TRACE, "enter\n");
 
-       btci = kmalloc(sizeof(struct brcmf_btcoex_info), GFP_KERNEL);
+       btci = kmalloc(sizeof(*btci), GFP_KERNEL);
        if (!btci)
                return -ENOMEM;
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 6b38d9de71af6ea481ad09f522c9e951795a8f64..1461dc453ac22e45766d2e8fd50b895e08dd0a5d 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -4450,7 +4450,7 @@ struct brcmf_sdio *brcmf_sdio_probe(struct brcmf_sdio_dev *sdiodev)
        brcmf_dbg(TRACE, "Enter\n");
 
        /* Allocate private bus interface state */
-       bus = kzalloc(sizeof(struct brcmf_sdio), GFP_ATOMIC);
+       bus = kzalloc(sizeof(*bus), GFP_ATOMIC);
        if (!bus)
                goto fail;
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
index 9a105e6debe1f59ac26cf774a693df298709ffa4..8afbf529c745038151c778f6ea35e45084a8171f 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
@@ -1236,8 +1236,8 @@ brcmf_usb_prepare_fw_request(struct brcmf_usbdev_info *devinfo)
 static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,
                              enum brcmf_fwvendor fwvid)
 {
-       struct brcmf_bus *bus = NULL;
-       struct brcmf_usbdev *bus_pub = NULL;
+       struct brcmf_bus *bus;
+       struct brcmf_usbdev *bus_pub;
        struct device *dev = devinfo->dev;
        struct brcmf_fw_request *fwreq;
        int ret;
@@ -1247,7 +1247,7 @@ static int brcmf_usb_probe_cb(struct brcmf_usbdev_info *devinfo,
        if (!bus_pub)
                return -ENODEV;
 
-       bus = kzalloc(sizeof(struct brcmf_bus), GFP_ATOMIC);
+       bus = kzalloc(sizeof(*bus), GFP_ATOMIC);
        if (!bus) {
                ret = -ENOMEM;
                goto fail;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c
index 2084b506a4500cf695a9dd2cdc4d5807154f8639..50d817485cf9fc4f93f63cb52990520dfdb3e1c0 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/aiutils.c
@@ -512,7 +512,7 @@ ai_attach(struct bcma_bus *pbus)
        struct si_info *sii;
 
        /* alloc struct si_info */
-       sii = kzalloc(sizeof(struct si_info), GFP_ATOMIC);
+       sii = kzalloc(sizeof(*sii), GFP_ATOMIC);
        if (sii == NULL)
                return NULL;
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c
index c3376f887114a4fb5e0f1b59ae91e11d7465208b..33d17b779201d2adfb172f1b18d3237f469005c1 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/ampdu.c
@@ -219,7 +219,7 @@ struct ampdu_info *brcms_c_ampdu_attach(struct brcms_c_info *wlc)
        struct ampdu_info *ampdu;
        int i;
 
-       ampdu = kzalloc(sizeof(struct ampdu_info), GFP_ATOMIC);
+       ampdu = kzalloc(sizeof(*ampdu), GFP_ATOMIC);
        if (!ampdu)
                return NULL;
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c
index 54c616919590d2ebc89c5b15e3415c605104833f..f411bc6d795d613ad783d35aab147a955c9c7bf1 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/antsel.c
@@ -111,7 +111,7 @@ struct antsel_info *brcms_c_antsel_attach(struct brcms_c_info *wlc)
        struct antsel_info *asi;
        struct ssb_sprom *sprom = &wlc->hw->d11core->bus->sprom;
 
-       asi = kzalloc(sizeof(struct antsel_info), GFP_ATOMIC);
+       asi = kzalloc(sizeof(*asi), GFP_ATOMIC);
        if (!asi)
                return NULL;
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
index f6962e558d7c73a8d4b604f9c04f4cea81f0b2fd..d1b9a18d0374034b0020283bd1513a7408f50615 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c
@@ -331,7 +331,7 @@ struct brcms_cm_info *brcms_c_channel_mgr_attach(struct brcms_c_info *wlc)
        const char *ccode = sprom->alpha2;
        int ccode_len = sizeof(sprom->alpha2);
 
-       wlc_cm = kzalloc(sizeof(struct brcms_cm_info), GFP_ATOMIC);
+       wlc_cm = kzalloc(sizeof(*wlc_cm), GFP_ATOMIC);
        if (wlc_cm == NULL)
                return NULL;
        wlc_cm->pub = pub;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c
index 3d5c1ef8f7f25b3a9802e0a37c27c7a6e1a9e18b..bd480239368a4bf817167c46f80d5eca96e2f7dc 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/dma.c
@@ -558,7 +558,7 @@ struct dma_pub *dma_attach(char *name, struct brcms_c_info *wlc,
        struct si_info *sii = container_of(sih, struct si_info, pub);
 
        /* allocate private info structure */
-       di = kzalloc(sizeof(struct dma_info), GFP_ATOMIC);
+       di = kzalloc(sizeof(*di), GFP_ATOMIC);
        if (di == NULL)
                return NULL;
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
index 92860dc0a92eb70eb30fd5f1761bf5a6416d3a7c..860ef9c11c46d31d5e88f76bbce197dde4068300 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
@@ -1496,7 +1496,7 @@ struct brcms_timer *brcms_init_timer(struct brcms_info *wl,
 {
        struct brcms_timer *t;
 
-       t = kzalloc(sizeof(struct brcms_timer), GFP_ATOMIC);
+       t = kzalloc(sizeof(*t), GFP_ATOMIC);
        if (!t)
                return NULL;
 

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
index 34460b5815d02ae9e2937e1b50bdf0e26862bb79..d3c74440381fb05fb83624a9dbbe53b5d7e8095e 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/main.c
@@ -463,11 +463,11 @@ static struct brcms_bss_cfg *brcms_c_bsscfg_malloc(uint unit)
 {
        struct brcms_bss_cfg *cfg;
 
-       cfg = kzalloc(sizeof(struct brcms_bss_cfg), GFP_ATOMIC);
+       cfg = kzalloc(sizeof(*cfg), GFP_ATOMIC);
        if (cfg == NULL)
                goto fail;
 
-       cfg->current_bss = kzalloc(sizeof(struct brcms_bss_info), GFP_ATOMIC);
+       cfg->current_bss = kzalloc(sizeof(*cfg->current_bss), GFP_ATOMIC);
        if (cfg->current_bss == NULL)
                goto fail;
 
@@ -483,14 +483,14 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)
 {
        struct brcms_c_info *wlc;
 
-       wlc = kzalloc(sizeof(struct brcms_c_info), GFP_ATOMIC);
+       wlc = kzalloc(sizeof(*wlc), GFP_ATOMIC);
        if (wlc == NULL) {
                *err = 1002;
                goto fail;
        }
 
        /* allocate struct brcms_c_pub state structure */
-       wlc->pub = kzalloc(sizeof(struct brcms_pub), GFP_ATOMIC);
+       wlc->pub = kzalloc(sizeof(*wlc->pub), GFP_ATOMIC);
        if (wlc->pub == NULL) {
                *err = 1003;
                goto fail;
@@ -499,7 +499,7 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)
 
        /* allocate struct brcms_hardware state structure */
 
-       wlc->hw = kzalloc(sizeof(struct brcms_hardware), GFP_ATOMIC);
+       wlc->hw = kzalloc(sizeof(*wlc->hw), GFP_ATOMIC);
        if (wlc->hw == NULL) {
                *err = 1005;
                goto fail;
@@ -528,7 +528,7 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)
                goto fail;
        }
 
-       wlc->default_bss = kzalloc(sizeof(struct brcms_bss_info), GFP_ATOMIC);
+       wlc->default_bss = kzalloc(sizeof(*wlc->default_bss), GFP_ATOMIC);
        if (wlc->default_bss == NULL) {
                *err = 1010;
                goto fail;
@@ -540,21 +540,20 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)
                goto fail;
        }
 
-       wlc->protection = kzalloc(sizeof(struct brcms_protection),
-                                 GFP_ATOMIC);
+       wlc->protection = kzalloc(sizeof(*wlc->protection), GFP_ATOMIC);
        if (wlc->protection == NULL) {
                *err = 1016;
                goto fail;
        }
 
-       wlc->stf = kzalloc(sizeof(struct brcms_stf), GFP_ATOMIC);
+       wlc->stf = kzalloc(sizeof(*wlc->stf), GFP_ATOMIC);
        if (wlc->stf == NULL) {
                *err = 1017;
                goto fail;
        }
 
        wlc->bandstate[0] =
-               kcalloc(MAXBANDS, sizeof(struct brcms_band), GFP_ATOMIC);
+               kcalloc(MAXBANDS, sizeof(*wlc->bandstate[0]), GFP_ATOMIC);
        if (wlc->bandstate[0] == NULL) {
                *err = 1025;
                goto fail;
@@ -567,14 +566,14 @@ brcms_c_attach_malloc(uint unit, uint *err, uint devid)
                                + (sizeof(struct brcms_band)*i));
        }
 
-       wlc->corestate = kzalloc(sizeof(struct brcms_core), GFP_ATOMIC);
+       wlc->corestate = kzalloc(sizeof(*wlc->corestate), GFP_ATOMIC);
        if (wlc->corestate == NULL) {
                *err = 1026;
                goto fail;
        }
 
        wlc->corestate->macstat_snapshot =
-               kzalloc(sizeof(struct macstat), GFP_ATOMIC);
+               kzalloc(sizeof(*wlc->corestate->macstat_snapshot), GFP_ATOMIC);
        if (wlc->corestate->macstat_snapshot == NULL) {
                *err = 1027;
                goto fail;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
index a27d6f0b881911509e617db0c700d955e48e1cdc..c3d7aa570b4e204acae90792f9769ed51ceb66df 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_cmn.c
@@ -355,7 +355,7 @@ struct shared_phy *wlc_phy_shared_attach(struct shared_phy_params *shp)
 {
        struct shared_phy *sh;
 
-       sh = kzalloc(sizeof(struct shared_phy), GFP_ATOMIC);
+       sh = kzalloc(sizeof(*sh), GFP_ATOMIC);
        if (sh == NULL)
                return NULL;
 
@@ -442,7 +442,7 @@ wlc_phy_attach(struct shared_phy *sh, struct bcma_device *d11core,
                return &pi->pubpi_ro;
        }
 
-       pi = kzalloc(sizeof(struct brcms_phy), GFP_ATOMIC);
+       pi = kzalloc(sizeof(*pi), GFP_ATOMIC);
        if (pi == NULL)
                return NULL;
        pi->wiphy = wiphy;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
index e472591f321bdf7775b91369050a3f3d0949c1df..d0faba2405610558af5acd5321b455ab0cdb9faf 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy/phy_lcn.c
@@ -4968,11 +4968,11 @@ bool wlc_phy_attach_lcnphy(struct brcms_phy *pi)
 {
        struct brcms_phy_lcnphy *pi_lcn;
 
-       pi->u.pi_lcnphy = kzalloc(sizeof(struct brcms_phy_lcnphy), GFP_ATOMIC);
-       if (pi->u.pi_lcnphy == NULL)
+       pi_lcn = kzalloc(sizeof(*pi_lcn), GFP_ATOMIC);
+       if (!pi_lcn)
                return false;
 
-       pi_lcn = pi->u.pi_lcnphy;
+       pi->u.pi_lcnphy = pi_lcn;
 
        if (0 == (pi->sh->boardflags & BFL_NOPA)) {
                pi->hwpwrctrl = true;

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c
index b7238179153653f35e6480314ba12980fcb88f69..8b852581c4e471f11c12b2fd95a017743de9ef77 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/phy_shim.c
@@ -38,9 +38,9 @@ struct phy_shim_info {
 struct phy_shim_info *wlc_phy_shim_attach(struct brcms_hardware *wlc_hw,
                                          struct brcms_info *wl,
                                          struct brcms_c_info *wlc) {
-       struct phy_shim_info *physhim = NULL;
+       struct phy_shim_info *physhim;
 
-       physhim = kzalloc(sizeof(struct phy_shim_info), GFP_ATOMIC);
+       physhim = kzalloc(sizeof(*physhim), GFP_ATOMIC);
        if (!physhim)
                return NULL;