brcmfmac: replace dongle command list with .preinit() callback

The bus-specific interface allowed a list of dongle commands to be
provided to the common driver part. However, upcoming functionality
requires a more dynamic behaviour. Hence the list is replaced
by a new callback function so the bus-specific driver part can
implement this behaviour.

Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 9431af2465f3..5c0c9191b794 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -257,8 +257,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         u8 buf[BRCMF_DCMD_SMLEN];
         char *ptr;
         s32 err;
-        struct brcmf_bus_dcmd *cmdlst;
-        struct list_head *cur, *q;
 
         /* retreive mac address */
         err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,
@@ -342,17 +340,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
         brcmf_c_pktfilter_offload_enable(ifp, BRCMF_DEFAULT_PACKET_FILTER,
                                          0, true);
 
-        /* set bus specific command if there is any */
-        list_for_each_safe(cur, q, &ifp->drvr->bus_if->dcmd_list) {
-                cmdlst = list_entry(cur, struct brcmf_bus_dcmd, list);
-                if (cmdlst->name && cmdlst->param && cmdlst->param_len) {
-                        brcmf_fil_iovar_data_set(ifp, cmdlst->name,
-                                                 cmdlst->param,
-                                                 cmdlst->param_len);
-                }
-                list_del(cur);
-                kfree(cmdlst);
-        }
+        /* do bus specific preinit here */
+        err = brcmf_bus_preinit(ifp->drvr->bus_if);
 done:
         return err;
 }