1 files changed, 14 insertions, 11 deletions

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
index e7eaa57d11d9..63e98fd583ab 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
@@ -102,7 +102,8 @@ static void brcmf_fweh_queue_event(struct brcmf_fweh_info *fweh,
         schedule_work(&fweh->event_work);
 }
 
-static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,
+static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,
+                                         struct brcmf_if *ifp,
                                          enum brcmf_fweh_event_code code,
                                          struct brcmf_event_msg *emsg,
                                          void *data)
@@ -117,9 +118,9 @@ static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,
                 if (fweh->evt_handler[code])
                         err = fweh->evt_handler[code](ifp, emsg, data);
                 else
-                        brcmf_err("unhandled event %d ignored\n", code);
+                        bphy_err(drvr, "unhandled event %d ignored\n", code);
         } else {
-                brcmf_err("no interface object\n");
+                bphy_err(drvr, "no interface object\n");
         }
         return err;
 }
@@ -158,7 +159,7 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
                 return;
         }
         if (ifevent->ifidx >= BRCMF_MAX_IFS) {
-                brcmf_err("invalid interface index: %u\n", ifevent->ifidx);
+                bphy_err(drvr, "invalid interface index: %u\n", ifevent->ifidx);
                 return;
         }
 
@@ -181,7 +182,8 @@ static void brcmf_fweh_handle_if_event(struct brcmf_pub *drvr,
         if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)
                 brcmf_proto_reset_if(drvr, ifp);
 
-        err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
+        err = brcmf_fweh_call_event_handler(drvr, ifp, emsg->event_code, emsg,
+                                            data);
 
         if (ifp && ifevent->action == BRCMF_E_IF_DEL) {
                 bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
@@ -268,11 +270,11 @@ static void brcmf_fweh_event_worker(struct work_struct *work)
                         ifp = drvr->iflist[0];
                 else
                         ifp = drvr->iflist[emsg.bsscfgidx];
-                err = brcmf_fweh_call_event_handler(ifp, event->code, &emsg,
-                                                    event->data);
+                err = brcmf_fweh_call_event_handler(drvr, ifp, event->code,
+                                                    &emsg, event->data);
                 if (err) {
-                        brcmf_err("event handler failed (%d)\n",
-                                  event->code);
+                        bphy_err(drvr, "event handler failed (%d)\n",
+                                 event->code);
                         err = 0;
                 }
 event_free:
@@ -339,7 +341,7 @@ int brcmf_fweh_register(struct brcmf_pub *drvr, enum brcmf_fweh_event_code code,
                         brcmf_fweh_handler_t handler)
 {
         if (drvr->fweh.evt_handler[code]) {
-                brcmf_err("event code %d already registered\n", code);
+                bphy_err(drvr, "event code %d already registered\n", code);
                 return -ENOSPC;
         }
         drvr->fweh.evt_handler[code] = handler;
@@ -369,6 +371,7 @@ void brcmf_fweh_unregister(struct brcmf_pub *drvr,
  */
 int brcmf_fweh_activate_events(struct brcmf_if *ifp)
 {
+        struct brcmf_pub *drvr = ifp->drvr;
         int i, err;
         s8 eventmask[BRCMF_EVENTING_MASK_LEN];
 
@@ -388,7 +391,7 @@ int brcmf_fweh_activate_events(struct brcmf_if *ifp)
         err = brcmf_fil_iovar_data_set(ifp, "event_msgs",
                                        eventmask, BRCMF_EVENTING_MASK_LEN);
         if (err)
-                brcmf_err("Set event_msgs error (%d)\n", err);
+                bphy_err(drvr, "Set event_msgs error (%d)\n", err);
 
         return err;
 }