1 From dcb1471bc6d0541d636c7ecd9239573304842884 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
3 Date: Tue, 19 Feb 2019 23:42:19 +0100
4 Subject: [PATCH] brcmfmac: use bphy_err() in all wiphy-related code
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 This recently added macro provides more meaningful error messages thanks
10 to identifying a specific wiphy. It's especially important on systems
11 with few cards supported by the same (brcmfmac) driver.
13 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
14 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
15 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
17 .../broadcom/brcm80211/brcmfmac/bcdc.c | 22 ++---
18 .../broadcom/brcm80211/brcmfmac/common.c | 39 ++++----
19 .../broadcom/brcm80211/brcmfmac/core.c | 74 ++++++++--------
20 .../broadcom/brcm80211/brcmfmac/feature.c | 8 +-
21 .../broadcom/brcm80211/brcmfmac/fweh.c | 25 +++---
22 .../broadcom/brcm80211/brcmfmac/fwil.c | 10 +--
23 .../broadcom/brcm80211/brcmfmac/fwsignal.c | 38 ++++----
24 .../broadcom/brcm80211/brcmfmac/msgbuf.c | 65 ++++++++------
25 .../broadcom/brcm80211/brcmfmac/p2p.c | 88 +++++++++++--------
26 .../broadcom/brcm80211/brcmfmac/pno.c | 22 +++--
27 .../broadcom/brcm80211/brcmfmac/proto.c | 6 +-
28 11 files changed, 224 insertions(+), 173 deletions(-)
30 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
31 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
32 @@ -178,8 +178,8 @@ brcmf_proto_bcdc_query_dcmd(struct brcmf
34 ret = brcmf_proto_bcdc_msg(drvr, ifidx, cmd, buf, len, false);
36 - brcmf_err("brcmf_proto_bcdc_msg failed w/status %d\n",
38 + bphy_err(drvr, "brcmf_proto_bcdc_msg failed w/status %d\n",
43 @@ -195,9 +195,9 @@ retry:
44 if ((id < bcdc->reqid) && (++retries < RETRIES))
46 if (id != bcdc->reqid) {
47 - brcmf_err("%s: unexpected request id %d (expected %d)\n",
48 - brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
50 + bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",
51 + brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
56 @@ -245,9 +245,9 @@ brcmf_proto_bcdc_set_dcmd(struct brcmf_p
57 id = (flags & BCDC_DCMD_ID_MASK) >> BCDC_DCMD_ID_SHIFT;
59 if (id != bcdc->reqid) {
60 - brcmf_err("%s: unexpected request id %d (expected %d)\n",
61 - brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
63 + bphy_err(drvr, "%s: unexpected request id %d (expected %d)\n",
64 + brcmf_ifname(brcmf_get_ifp(drvr, ifidx)), id,
69 @@ -312,8 +312,8 @@ brcmf_proto_bcdc_hdrpull(struct brcmf_pu
71 if (((h->flags & BCDC_FLAG_VER_MASK) >> BCDC_FLAG_VER_SHIFT) !=
73 - brcmf_err("%s: non-BCDC packet received, flags 0x%x\n",
74 - brcmf_ifname(tmp_if), h->flags);
75 + bphy_err(drvr, "%s: non-BCDC packet received, flags 0x%x\n",
76 + brcmf_ifname(tmp_if), h->flags);
80 @@ -460,7 +460,7 @@ int brcmf_proto_bcdc_attach(struct brcmf
82 /* ensure that the msg buf directly follows the cdc msg struct */
83 if ((unsigned long)(&bcdc->msg + 1) != (unsigned long)bcdc->buf) {
84 - brcmf_err("struct brcmf_proto_bcdc is not correctly defined\n");
85 + bphy_err(drvr, "struct brcmf_proto_bcdc is not correctly defined\n");
89 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
90 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
91 @@ -90,6 +90,7 @@ struct brcmf_mp_global_t brcmf_mp_global
93 void brcmf_c_set_joinpref_default(struct brcmf_if *ifp)
95 + struct brcmf_pub *drvr = ifp->drvr;
96 struct brcmf_join_pref_params join_pref_params[2];
99 @@ -106,7 +107,7 @@ void brcmf_c_set_joinpref_default(struct
100 err = brcmf_fil_iovar_data_set(ifp, "join_pref", join_pref_params,
101 sizeof(join_pref_params));
103 - brcmf_err("Set join_pref error (%d)\n", err);
104 + bphy_err(drvr, "Set join_pref error (%d)\n", err);
107 static int brcmf_c_download(struct brcmf_if *ifp, u16 flag,
108 @@ -129,7 +130,8 @@ static int brcmf_c_download(struct brcmf
110 static int brcmf_c_process_clm_blob(struct brcmf_if *ifp)
112 - struct brcmf_bus *bus = ifp->drvr->bus_if;
113 + struct brcmf_pub *drvr = ifp->drvr;
114 + struct brcmf_bus *bus = drvr->bus_if;
115 struct brcmf_dload_data_le *chunk_buf;
116 const struct firmware *clm = NULL;
117 u8 clm_name[BRCMF_FW_NAME_LEN];
118 @@ -145,7 +147,7 @@ static int brcmf_c_process_clm_blob(stru
119 memset(clm_name, 0, sizeof(clm_name));
120 err = brcmf_bus_get_fwname(bus, ".clm_blob", clm_name);
122 - brcmf_err("get CLM blob file name failed (%d)\n", err);
123 + bphy_err(drvr, "get CLM blob file name failed (%d)\n", err);
127 @@ -182,12 +184,12 @@ static int brcmf_c_process_clm_blob(stru
128 } while ((datalen > 0) && (err == 0));
131 - brcmf_err("clmload (%zu byte file) failed (%d); ",
133 + bphy_err(drvr, "clmload (%zu byte file) failed (%d)\n",
135 /* Retrieve clmload_status and print */
136 err = brcmf_fil_iovar_int_get(ifp, "clmload_status", &status);
138 - brcmf_err("get clmload_status failed (%d)\n", err);
139 + bphy_err(drvr, "get clmload_status failed (%d)\n", err);
141 brcmf_dbg(INFO, "clmload_status=%d\n", status);
143 @@ -201,6 +203,7 @@ done:
145 int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
147 + struct brcmf_pub *drvr = ifp->drvr;
148 s8 eventmask[BRCMF_EVENTING_MASK_LEN];
149 u8 buf[BRCMF_DCMD_SMLEN];
150 struct brcmf_bus *bus;
151 @@ -214,7 +217,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
152 err = brcmf_fil_iovar_data_get(ifp, "cur_etheraddr", ifp->mac_addr,
153 sizeof(ifp->mac_addr));
155 - brcmf_err("Retrieving cur_etheraddr failed, %d\n", err);
156 + bphy_err(drvr, "Retrieving cur_etheraddr failed, %d\n", err);
159 memcpy(ifp->drvr->wiphy->perm_addr, ifp->drvr->mac, ETH_ALEN);
160 @@ -226,7 +229,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
161 err = brcmf_fil_cmd_data_get(ifp, BRCMF_C_GET_REVINFO,
162 &revinfo, sizeof(revinfo));
164 - brcmf_err("retrieving revision info failed, %d\n", err);
165 + bphy_err(drvr, "retrieving revision info failed, %d\n", err);
166 strlcpy(ri->chipname, "UNKNOWN", sizeof(ri->chipname));
168 ri->vendorid = le32_to_cpu(revinfo.vendorid);
169 @@ -260,7 +263,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
170 /* Do any CLM downloading */
171 err = brcmf_c_process_clm_blob(ifp);
173 - brcmf_err("download CLM blob file failed, %d\n", err);
174 + bphy_err(drvr, "download CLM blob file failed, %d\n", err);
178 @@ -269,8 +272,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
180 err = brcmf_fil_iovar_data_get(ifp, "ver", buf, sizeof(buf));
182 - brcmf_err("Retrieving version information failed, %d\n",
184 + bphy_err(drvr, "Retrieving version information failed, %d\n",
189 @@ -304,7 +307,7 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
191 err = brcmf_fil_iovar_int_set(ifp, "mpc", 1);
193 - brcmf_err("failed setting mpc\n");
194 + bphy_err(drvr, "failed setting mpc\n");
198 @@ -314,14 +317,14 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
199 err = brcmf_fil_iovar_data_get(ifp, "event_msgs", eventmask,
200 BRCMF_EVENTING_MASK_LEN);
202 - brcmf_err("Get event_msgs error (%d)\n", err);
203 + bphy_err(drvr, "Get event_msgs error (%d)\n", err);
206 setbit(eventmask, BRCMF_E_IF);
207 err = brcmf_fil_iovar_data_set(ifp, "event_msgs", eventmask,
208 BRCMF_EVENTING_MASK_LEN);
210 - brcmf_err("Set event_msgs error (%d)\n", err);
211 + bphy_err(drvr, "Set event_msgs error (%d)\n", err);
215 @@ -329,8 +332,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
216 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_CHANNEL_TIME,
217 BRCMF_DEFAULT_SCAN_CHANNEL_TIME);
219 - brcmf_err("BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",
221 + bphy_err(drvr, "BRCMF_C_SET_SCAN_CHANNEL_TIME error (%d)\n",
226 @@ -338,8 +341,8 @@ int brcmf_c_preinit_dcmds(struct brcmf_i
227 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_SCAN_UNASSOC_TIME,
228 BRCMF_DEFAULT_SCAN_UNASSOC_TIME);
230 - brcmf_err("BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",
232 + bphy_err(drvr, "BRCMF_C_SET_SCAN_UNASSOC_TIME error (%d)\n",
237 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
238 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
239 @@ -90,7 +90,7 @@ struct brcmf_if *brcmf_get_ifp(struct br
242 if (ifidx < 0 || ifidx >= BRCMF_MAX_IFS) {
243 - brcmf_err("ifidx %d out of range\n", ifidx);
244 + bphy_err(drvr, "ifidx %d out of range\n", ifidx);
248 @@ -141,7 +141,9 @@ void brcmf_configure_arp_nd_offload(stru
250 static void _brcmf_set_multicast_list(struct work_struct *work)
252 - struct brcmf_if *ifp;
253 + struct brcmf_if *ifp = container_of(work, struct brcmf_if,
255 + struct brcmf_pub *drvr = ifp->drvr;
256 struct net_device *ndev;
257 struct netdev_hw_addr *ha;
259 @@ -150,8 +152,6 @@ static void _brcmf_set_multicast_list(st
263 - ifp = container_of(work, struct brcmf_if, multicast_work);
265 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
268 @@ -181,7 +181,7 @@ static void _brcmf_set_multicast_list(st
270 err = brcmf_fil_iovar_data_set(ifp, "mcast_list", buf, buflen);
272 - brcmf_err("Setting mcast_list failed, %d\n", err);
273 + bphy_err(drvr, "Setting mcast_list failed, %d\n", err);
274 cmd_value = cnt ? true : cmd_value;
277 @@ -194,25 +194,25 @@ static void _brcmf_set_multicast_list(st
279 err = brcmf_fil_iovar_int_set(ifp, "allmulti", cmd_value);
281 - brcmf_err("Setting allmulti failed, %d\n", err);
282 + bphy_err(drvr, "Setting allmulti failed, %d\n", err);
284 /*Finally, pick up the PROMISC flag */
285 cmd_value = (ndev->flags & IFF_PROMISC) ? true : false;
286 err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PROMISC, cmd_value);
288 - brcmf_err("Setting BRCMF_C_SET_PROMISC failed, %d\n",
290 + bphy_err(drvr, "Setting BRCMF_C_SET_PROMISC failed, %d\n",
292 brcmf_configure_arp_nd_offload(ifp, !cmd_value);
295 #if IS_ENABLED(CONFIG_IPV6)
296 static void _brcmf_update_ndtable(struct work_struct *work)
298 - struct brcmf_if *ifp;
299 + struct brcmf_if *ifp = container_of(work, struct brcmf_if,
301 + struct brcmf_pub *drvr = ifp->drvr;
304 - ifp = container_of(work, struct brcmf_if, ndoffload_work);
306 /* clear the table in firmware */
307 ret = brcmf_fil_iovar_data_set(ifp, "nd_hostip_clear", NULL, 0);
309 @@ -225,7 +225,7 @@ static void _brcmf_update_ndtable(struct
310 &ifp->ipv6_addr_tbl[i],
311 sizeof(struct in6_addr));
313 - brcmf_err("add nd ip err %d\n", ret);
314 + bphy_err(drvr, "add nd ip err %d\n", ret);
318 @@ -238,6 +238,7 @@ static int brcmf_netdev_set_mac_address(
320 struct brcmf_if *ifp = netdev_priv(ndev);
321 struct sockaddr *sa = (struct sockaddr *)addr;
322 + struct brcmf_pub *drvr = ifp->drvr;
325 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
326 @@ -245,7 +246,7 @@ static int brcmf_netdev_set_mac_address(
327 err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", sa->sa_data,
330 - brcmf_err("Setting cur_etheraddr failed, %d\n", err);
331 + bphy_err(drvr, "Setting cur_etheraddr failed, %d\n", err);
333 brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);
334 memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
335 @@ -305,7 +306,7 @@ static netdev_tx_t brcmf_netdev_start_xm
337 /* Can the device send data? */
338 if (drvr->bus_if->state != BRCMF_BUS_UP) {
339 - brcmf_err("xmit rejected state=%d\n", drvr->bus_if->state);
340 + bphy_err(drvr, "xmit rejected state=%d\n", drvr->bus_if->state);
341 netif_stop_queue(ndev);
344 @@ -339,8 +340,8 @@ static netdev_tx_t brcmf_netdev_start_xm
345 ret = pskb_expand_head(skb, ALIGN(head_delta, NET_SKB_PAD), 0,
348 - brcmf_err("%s: failed to expand headroom\n",
349 - brcmf_ifname(ifp));
350 + bphy_err(drvr, "%s: failed to expand headroom\n",
351 + brcmf_ifname(ifp));
352 atomic_inc(&drvr->bus_if->stats.pktcow_failed);
355 @@ -607,7 +608,7 @@ static int brcmf_netdev_open(struct net_
357 /* If bus is not ready, can't continue */
358 if (bus_if->state != BRCMF_BUS_UP) {
359 - brcmf_err("failed bus is not ready\n");
360 + bphy_err(drvr, "failed bus is not ready\n");
364 @@ -621,7 +622,7 @@ static int brcmf_netdev_open(struct net_
365 ndev->features &= ~NETIF_F_IP_CSUM;
367 if (brcmf_cfg80211_up(ndev)) {
368 - brcmf_err("failed to bring up cfg80211\n");
369 + bphy_err(drvr, "failed to bring up cfg80211\n");
373 @@ -683,7 +684,7 @@ int brcmf_net_attach(struct brcmf_if *if
375 err = register_netdev(ndev);
377 - brcmf_err("couldn't register the net device\n");
378 + bphy_err(drvr, "couldn't register the net device\n");
382 @@ -760,6 +761,7 @@ static const struct net_device_ops brcmf
384 static int brcmf_net_p2p_attach(struct brcmf_if *ifp)
386 + struct brcmf_pub *drvr = ifp->drvr;
387 struct net_device *ndev;
389 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d mac=%pM\n", ifp->bsscfgidx,
390 @@ -772,7 +774,7 @@ static int brcmf_net_p2p_attach(struct b
391 memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
393 if (register_netdev(ndev) != 0) {
394 - brcmf_err("couldn't register the p2p net device\n");
395 + bphy_err(drvr, "couldn't register the p2p net device\n");
399 @@ -801,8 +803,8 @@ struct brcmf_if *brcmf_add_if(struct brc
403 - brcmf_err("ERROR: netdev:%s already exists\n",
405 + bphy_err(drvr, "ERROR: netdev:%s already exists\n",
407 netif_stop_queue(ifp->ndev);
408 brcmf_net_detach(ifp->ndev, false);
409 drvr->iflist[bsscfgidx] = NULL;
410 @@ -864,7 +866,7 @@ static void brcmf_del_if(struct brcmf_pu
411 ifp = drvr->iflist[bsscfgidx];
412 drvr->iflist[bsscfgidx] = NULL;
414 - brcmf_err("Null interface, bsscfgidx=%d\n", bsscfgidx);
415 + bphy_err(drvr, "Null interface, bsscfgidx=%d\n", bsscfgidx);
418 brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", bsscfgidx,
419 @@ -914,16 +916,17 @@ static int brcmf_psm_watchdog_notify(str
420 const struct brcmf_event_msg *evtmsg,
423 + struct brcmf_pub *drvr = ifp->drvr;
426 brcmf_dbg(TRACE, "enter: bsscfgidx=%d\n", ifp->bsscfgidx);
428 - brcmf_err("PSM's watchdog has fired!\n");
429 + bphy_err(drvr, "PSM's watchdog has fired!\n");
431 err = brcmf_debug_create_memdump(ifp->drvr->bus_if, data,
434 - brcmf_err("Failed to get memory dump, %d\n", err);
435 + bphy_err(drvr, "Failed to get memory dump, %d\n", err);
439 @@ -967,7 +970,7 @@ static int brcmf_inetaddr_changed(struct
440 ret = brcmf_fil_iovar_data_get(ifp, "arp_hostip", addr_table,
443 - brcmf_err("fail to get arp ip table err:%d\n", ret);
444 + bphy_err(drvr, "fail to get arp ip table err:%d\n", ret);
448 @@ -984,7 +987,7 @@ static int brcmf_inetaddr_changed(struct
449 ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip",
450 &ifa->ifa_address, sizeof(ifa->ifa_address));
452 - brcmf_err("add arp ip err %d\n", ret);
453 + bphy_err(drvr, "add arp ip err %d\n", ret);
457 @@ -996,8 +999,8 @@ static int brcmf_inetaddr_changed(struct
458 ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip_clear",
461 - brcmf_err("fail to clear arp ip table err:%d\n",
463 + bphy_err(drvr, "fail to clear arp ip table err:%d\n",
467 for (i = 0; i < ARPOL_MAX_ENTRIES; i++) {
468 @@ -1007,8 +1010,8 @@ static int brcmf_inetaddr_changed(struct
470 sizeof(addr_table[i]));
472 - brcmf_err("add arp ip err %d\n",
474 + bphy_err(drvr, "add arp ip err %d\n",
479 @@ -1182,7 +1185,7 @@ static int brcmf_bus_started(struct brcm
483 - brcmf_err("failed: %d\n", ret);
484 + bphy_err(drvr, "failed: %d\n", ret);
486 brcmf_cfg80211_detach(drvr->config);
488 @@ -1234,7 +1237,7 @@ int brcmf_attach(struct device *dev, str
489 /* Attach and link in the protocol */
490 ret = brcmf_proto_attach(drvr);
492 - brcmf_err("brcmf_prot_attach failed\n");
493 + bphy_err(drvr, "brcmf_prot_attach failed\n");
497 @@ -1247,7 +1250,7 @@ int brcmf_attach(struct device *dev, str
499 ret = brcmf_bus_started(drvr, ops);
501 - brcmf_err("dongle is not responding: err=%d\n", ret);
502 + bphy_err(drvr, "dongle is not responding: err=%d\n", ret);
506 @@ -1347,6 +1350,7 @@ static int brcmf_get_pend_8021x_cnt(stru
508 int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)
510 + struct brcmf_pub *drvr = ifp->drvr;
513 err = wait_event_timeout(ifp->pend_8021x_wait,
514 @@ -1354,7 +1358,7 @@ int brcmf_netdev_wait_pend8021x(struct b
515 MAX_WAIT_FOR_8021X_TX);
518 - brcmf_err("Timed out waiting for no pending 802.1x packets\n");
519 + bphy_err(drvr, "Timed out waiting for no pending 802.1x packets\n");
523 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
524 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
525 @@ -185,13 +185,14 @@ static void brcmf_feat_iovar_data_set(st
526 #define MAX_CAPS_BUFFER_SIZE 768
527 static void brcmf_feat_firmware_capabilities(struct brcmf_if *ifp)
529 + struct brcmf_pub *drvr = ifp->drvr;
530 char caps[MAX_CAPS_BUFFER_SIZE];
531 enum brcmf_feat_id id;
534 err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
536 - brcmf_err("could not get firmware cap (%d)\n", err);
537 + bphy_err(drvr, "could not get firmware cap (%d)\n", err);
541 @@ -216,14 +217,15 @@ static void brcmf_feat_firmware_capabili
542 static int brcmf_feat_fwcap_debugfs_read(struct seq_file *seq, void *data)
544 struct brcmf_bus *bus_if = dev_get_drvdata(seq->private);
545 - struct brcmf_if *ifp = brcmf_get_ifp(bus_if->drvr, 0);
546 + struct brcmf_pub *drvr = bus_if->drvr;
547 + struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
548 char caps[MAX_CAPS_BUFFER_SIZE + 1] = { };
552 err = brcmf_fil_iovar_data_get(ifp, "cap", caps, sizeof(caps));
554 - brcmf_err("could not get firmware cap (%d)\n", err);
555 + bphy_err(drvr, "could not get firmware cap (%d)\n", err);
559 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
560 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
561 @@ -102,7 +102,8 @@ static void brcmf_fweh_queue_event(struc
562 schedule_work(&fweh->event_work);
565 -static int brcmf_fweh_call_event_handler(struct brcmf_if *ifp,
566 +static int brcmf_fweh_call_event_handler(struct brcmf_pub *drvr,
567 + struct brcmf_if *ifp,
568 enum brcmf_fweh_event_code code,
569 struct brcmf_event_msg *emsg,
571 @@ -117,9 +118,9 @@ static int brcmf_fweh_call_event_handler
572 if (fweh->evt_handler[code])
573 err = fweh->evt_handler[code](ifp, emsg, data);
575 - brcmf_err("unhandled event %d ignored\n", code);
576 + bphy_err(drvr, "unhandled event %d ignored\n", code);
578 - brcmf_err("no interface object\n");
579 + bphy_err(drvr, "no interface object\n");
583 @@ -158,7 +159,7 @@ static void brcmf_fweh_handle_if_event(s
586 if (ifevent->ifidx >= BRCMF_MAX_IFS) {
587 - brcmf_err("invalid interface index: %u\n", ifevent->ifidx);
588 + bphy_err(drvr, "invalid interface index: %u\n", ifevent->ifidx);
592 @@ -181,7 +182,8 @@ static void brcmf_fweh_handle_if_event(s
593 if (ifp && ifevent->action == BRCMF_E_IF_CHANGE)
594 brcmf_proto_reset_if(drvr, ifp);
596 - err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
597 + err = brcmf_fweh_call_event_handler(drvr, ifp, emsg->event_code, emsg,
600 if (ifp && ifevent->action == BRCMF_E_IF_DEL) {
601 bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
602 @@ -268,11 +270,11 @@ static void brcmf_fweh_event_worker(stru
603 ifp = drvr->iflist[0];
605 ifp = drvr->iflist[emsg.bsscfgidx];
606 - err = brcmf_fweh_call_event_handler(ifp, event->code, &emsg,
608 + err = brcmf_fweh_call_event_handler(drvr, ifp, event->code,
609 + &emsg, event->data);
611 - brcmf_err("event handler failed (%d)\n",
613 + bphy_err(drvr, "event handler failed (%d)\n",
618 @@ -339,7 +341,7 @@ int brcmf_fweh_register(struct brcmf_pub
619 brcmf_fweh_handler_t handler)
621 if (drvr->fweh.evt_handler[code]) {
622 - brcmf_err("event code %d already registered\n", code);
623 + bphy_err(drvr, "event code %d already registered\n", code);
626 drvr->fweh.evt_handler[code] = handler;
627 @@ -369,6 +371,7 @@ void brcmf_fweh_unregister(struct brcmf_
629 int brcmf_fweh_activate_events(struct brcmf_if *ifp)
631 + struct brcmf_pub *drvr = ifp->drvr;
633 s8 eventmask[BRCMF_EVENTING_MASK_LEN];
635 @@ -388,7 +391,7 @@ int brcmf_fweh_activate_events(struct br
636 err = brcmf_fil_iovar_data_set(ifp, "event_msgs",
637 eventmask, BRCMF_EVENTING_MASK_LEN);
639 - brcmf_err("Set event_msgs error (%d)\n", err);
640 + bphy_err(drvr, "Set event_msgs error (%d)\n", err);
644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
645 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
646 @@ -110,7 +110,7 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp,
649 if (drvr->bus_if->state != BRCMF_BUS_UP) {
650 - brcmf_err("bus is down. we have nothing to do.\n");
651 + bphy_err(drvr, "bus is down. we have nothing to do.\n");
655 @@ -242,7 +242,7 @@ brcmf_fil_iovar_data_set(struct brcmf_if
659 - brcmf_err("Creating iovar failed\n");
660 + bphy_err(drvr, "Creating iovar failed\n");
663 mutex_unlock(&drvr->proto_block);
664 @@ -268,7 +268,7 @@ brcmf_fil_iovar_data_get(struct brcmf_if
665 memcpy(data, drvr->proto_buf, len);
668 - brcmf_err("Creating iovar failed\n");
669 + bphy_err(drvr, "Creating iovar failed\n");
672 brcmf_dbg(FIL, "ifidx=%d, name=%s, len=%d\n", ifp->ifidx, name, len);
673 @@ -366,7 +366,7 @@ brcmf_fil_bsscfg_data_set(struct brcmf_i
677 - brcmf_err("Creating bsscfg failed\n");
678 + bphy_err(drvr, "Creating bsscfg failed\n");
681 mutex_unlock(&drvr->proto_block);
682 @@ -392,7 +392,7 @@ brcmf_fil_bsscfg_data_get(struct brcmf_i
683 memcpy(data, drvr->proto_buf, len);
686 - brcmf_err("Creating bsscfg failed\n");
687 + bphy_err(drvr, "Creating bsscfg failed\n");
689 brcmf_dbg(FIL, "ifidx=%d, bsscfgidx=%d, name=%s, len=%d\n", ifp->ifidx,
690 ifp->bsscfgidx, name, len);
691 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
692 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
693 @@ -1255,6 +1255,7 @@ static int brcmf_fws_enq(struct brcmf_fw
694 enum brcmf_fws_skb_state state, int fifo,
697 + struct brcmf_pub *drvr = fws->drvr;
699 u32 *qfull_stat = &fws->stats.delayq_full_error;
700 struct brcmf_fws_mac_descriptor *entry;
701 @@ -1267,7 +1268,7 @@ static int brcmf_fws_enq(struct brcmf_fw
703 entry = brcmf_skbcb(p)->mac;
705 - brcmf_err("no mac descriptor found for skb %p\n", p);
706 + bphy_err(drvr, "no mac descriptor found for skb %p\n", p);
710 @@ -1457,6 +1458,7 @@ static int
711 brcmf_fws_txs_process(struct brcmf_fws_info *fws, u8 flags, u32 hslot,
712 u32 genbit, u16 seq, u8 compcnt)
714 + struct brcmf_pub *drvr = fws->drvr;
718 @@ -1481,14 +1483,14 @@ brcmf_fws_txs_process(struct brcmf_fws_i
719 else if (flags == BRCMF_FWS_TXSTATUS_HOST_TOSSED)
720 fws->stats.txs_host_tossed += compcnt;
722 - brcmf_err("unexpected txstatus\n");
723 + bphy_err(drvr, "unexpected txstatus\n");
725 while (cnt < compcnt) {
726 ret = brcmf_fws_hanger_poppkt(&fws->hanger, hslot, &skb,
729 - brcmf_err("no packet in hanger slot: hslot=%d\n",
731 + bphy_err(drvr, "no packet in hanger slot: hslot=%d\n",
736 @@ -1612,12 +1614,13 @@ static int brcmf_fws_notify_credit_map(s
737 const struct brcmf_event_msg *e,
740 - struct brcmf_fws_info *fws = drvr_to_fws(ifp->drvr);
741 + struct brcmf_pub *drvr = ifp->drvr;
742 + struct brcmf_fws_info *fws = drvr_to_fws(drvr);
746 if (e->datalen < BRCMF_FWS_FIFO_COUNT) {
747 - brcmf_err("event payload too small (%d)\n", e->datalen);
748 + bphy_err(drvr, "event payload too small (%d)\n", e->datalen);
752 @@ -1681,6 +1684,7 @@ static void brcmf_rxreorder_get_skb_list
754 void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt)
756 + struct brcmf_pub *drvr = ifp->drvr;
758 u8 flow_id, max_idx, cur_idx, exp_idx, end_idx;
759 struct brcmf_ampdu_rx_reorder *rfi;
760 @@ -1695,7 +1699,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
762 /* validate flags and flow id */
764 - brcmf_err("invalid flags...so ignore this packet\n");
765 + bphy_err(drvr, "invalid flags...so ignore this packet\n");
766 brcmf_netif_rx(ifp, pkt);
769 @@ -1732,7 +1736,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
771 rfi = kzalloc(buf_size, GFP_ATOMIC);
773 - brcmf_err("failed to alloc buffer\n");
774 + bphy_err(drvr, "failed to alloc buffer\n");
775 brcmf_netif_rx(ifp, pkt);
778 @@ -1996,6 +2000,7 @@ static u8 brcmf_fws_precommit_skb(struct
779 static void brcmf_fws_rollback_toq(struct brcmf_fws_info *fws,
780 struct sk_buff *skb, int fifo)
782 + struct brcmf_pub *drvr = fws->drvr;
783 struct brcmf_fws_mac_descriptor *entry;
784 struct sk_buff *pktout;
786 @@ -2009,11 +2014,11 @@ static void brcmf_fws_rollback_toq(struc
788 pktout = brcmu_pktq_penq_head(&entry->psq, qidx, skb);
789 if (pktout == NULL) {
790 - brcmf_err("%s queue %d full\n", entry->name, qidx);
791 + bphy_err(drvr, "%s queue %d full\n", entry->name, qidx);
795 - brcmf_err("%s entry removed\n", entry->name);
796 + bphy_err(drvr, "%s entry removed\n", entry->name);
800 @@ -2118,7 +2123,8 @@ static int brcmf_fws_assign_htod(struct
802 int brcmf_fws_process_skb(struct brcmf_if *ifp, struct sk_buff *skb)
804 - struct brcmf_fws_info *fws = drvr_to_fws(ifp->drvr);
805 + struct brcmf_pub *drvr = ifp->drvr;
806 + struct brcmf_fws_info *fws = drvr_to_fws(drvr);
807 struct brcmf_skbuff_cb *skcb = brcmf_skbcb(skb);
808 struct ethhdr *eh = (struct ethhdr *)(skb->data);
809 int fifo = BRCMF_FWS_FIFO_BCMC;
810 @@ -2146,7 +2152,7 @@ int brcmf_fws_process_skb(struct brcmf_i
811 brcmf_fws_enq(fws, BRCMF_FWS_SKBSTATE_DELAYED, fifo, skb);
812 brcmf_fws_schedule_deq(fws);
814 - brcmf_err("drop skb: no hanger slot\n");
815 + bphy_err(drvr, "drop skb: no hanger slot\n");
816 brcmf_txfinalize(ifp, skb, false);
819 @@ -2365,7 +2371,7 @@ struct brcmf_fws_info *brcmf_fws_attach(
821 fws->fws_wq = create_singlethread_workqueue("brcmf_fws_wq");
822 if (fws->fws_wq == NULL) {
823 - brcmf_err("workqueue creation failed\n");
824 + bphy_err(drvr, "workqueue creation failed\n");
828 @@ -2381,13 +2387,13 @@ struct brcmf_fws_info *brcmf_fws_attach(
829 rc = brcmf_fweh_register(drvr, BRCMF_E_FIFO_CREDIT_MAP,
830 brcmf_fws_notify_credit_map);
832 - brcmf_err("register credit map handler failed\n");
833 + bphy_err(drvr, "register credit map handler failed\n");
836 rc = brcmf_fweh_register(drvr, BRCMF_E_BCMC_CREDIT_SUPPORT,
837 brcmf_fws_notify_bcmc_credit_support);
839 - brcmf_err("register bcmc credit handler failed\n");
840 + bphy_err(drvr, "register bcmc credit handler failed\n");
841 brcmf_fweh_unregister(drvr, BRCMF_E_FIFO_CREDIT_MAP);
844 @@ -2399,7 +2405,7 @@ struct brcmf_fws_info *brcmf_fws_attach(
845 fws->fw_signals = true;
846 ifp = brcmf_get_ifp(drvr, 0);
847 if (brcmf_fil_iovar_int_set(ifp, "tlv", tlv)) {
848 - brcmf_err("failed to set bdcv2 tlv signaling\n");
849 + bphy_err(drvr, "failed to set bdcv2 tlv signaling\n");
850 fws->fcmode = BRCMF_FWS_FCMODE_NONE;
851 fws->fw_signals = false;
853 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
854 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
855 @@ -439,7 +439,7 @@ static int brcmf_msgbuf_tx_ioctl(struct
856 brcmf_commonring_lock(commonring);
857 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
859 - brcmf_err("Failed to reserve space in commonring\n");
860 + bphy_err(drvr, "Failed to reserve space in commonring\n");
861 brcmf_commonring_unlock(commonring);
864 @@ -503,7 +503,7 @@ static int brcmf_msgbuf_query_dcmd(struc
866 timeout = brcmf_msgbuf_ioctl_resp_wait(msgbuf);
868 - brcmf_err("Timeout on response for query command\n");
869 + bphy_err(drvr, "Timeout on response for query command\n");
873 @@ -580,6 +580,7 @@ static u32
874 brcmf_msgbuf_flowring_create_worker(struct brcmf_msgbuf *msgbuf,
875 struct brcmf_msgbuf_work_item *work)
877 + struct brcmf_pub *drvr = msgbuf->drvr;
878 struct msgbuf_tx_flowring_create_req *create;
879 struct brcmf_commonring *commonring;
881 @@ -595,7 +596,7 @@ brcmf_msgbuf_flowring_create_worker(stru
882 &msgbuf->flowring_dma_handle[flowid],
885 - brcmf_err("dma_alloc_coherent failed\n");
886 + bphy_err(drvr, "dma_alloc_coherent failed\n");
887 brcmf_flowring_delete(msgbuf->flow, flowid);
888 return BRCMF_FLOWRING_INVALID_ID;
890 @@ -608,7 +609,7 @@ brcmf_msgbuf_flowring_create_worker(stru
891 brcmf_commonring_lock(commonring);
892 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
894 - brcmf_err("Failed to reserve space in commonring\n");
895 + bphy_err(drvr, "Failed to reserve space in commonring\n");
896 brcmf_commonring_unlock(commonring);
897 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
898 return BRCMF_FLOWRING_INVALID_ID;
899 @@ -635,7 +636,7 @@ brcmf_msgbuf_flowring_create_worker(stru
900 err = brcmf_commonring_write_complete(commonring);
901 brcmf_commonring_unlock(commonring);
903 - brcmf_err("Failed to write commonring\n");
904 + bphy_err(drvr, "Failed to write commonring\n");
905 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
906 return BRCMF_FLOWRING_INVALID_ID;
908 @@ -694,6 +695,7 @@ static u32 brcmf_msgbuf_flowring_create(
909 static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
911 struct brcmf_flowring *flow = msgbuf->flow;
912 + struct brcmf_pub *drvr = msgbuf->drvr;
913 struct brcmf_commonring *commonring;
916 @@ -713,8 +715,8 @@ static void brcmf_msgbuf_txflow(struct b
917 while (brcmf_flowring_qlen(flow, flowid)) {
918 skb = brcmf_flowring_dequeue(flow, flowid);
920 - brcmf_err("No SKB, but qlen %d\n",
921 - brcmf_flowring_qlen(flow, flowid));
922 + bphy_err(drvr, "No SKB, but qlen %d\n",
923 + brcmf_flowring_qlen(flow, flowid));
927 @@ -722,7 +724,7 @@ static void brcmf_msgbuf_txflow(struct b
928 msgbuf->tx_pktids, skb, ETH_HLEN,
929 &physaddr, &pktid)) {
930 brcmf_flowring_reinsert(flow, flowid, skb);
931 - brcmf_err("No PKTID available !!\n");
932 + bphy_err(drvr, "No PKTID available !!\n");
935 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
936 @@ -893,6 +895,7 @@ brcmf_msgbuf_process_txstatus(struct brc
938 static u32 brcmf_msgbuf_rxbuf_data_post(struct brcmf_msgbuf *msgbuf, u32 count)
940 + struct brcmf_pub *drvr = msgbuf->drvr;
941 struct brcmf_commonring *commonring;
944 @@ -920,7 +923,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(
945 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
948 - brcmf_err("Failed to alloc SKB\n");
949 + bphy_err(drvr, "Failed to alloc SKB\n");
950 brcmf_commonring_write_cancel(commonring, alloced - i);
953 @@ -930,7 +933,7 @@ static u32 brcmf_msgbuf_rxbuf_data_post(
954 msgbuf->rx_pktids, skb, 0,
955 &physaddr, &pktid)) {
956 dev_kfree_skb_any(skb);
957 - brcmf_err("No PKTID available !!\n");
958 + bphy_err(drvr, "No PKTID available !!\n");
959 brcmf_commonring_write_cancel(commonring, alloced - i);
962 @@ -1000,6 +1003,7 @@ static u32
963 brcmf_msgbuf_rxbuf_ctrl_post(struct brcmf_msgbuf *msgbuf, bool event_buf,
966 + struct brcmf_pub *drvr = msgbuf->drvr;
967 struct brcmf_commonring *commonring;
970 @@ -1017,7 +1021,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
974 - brcmf_err("Failed to reserve space in commonring\n");
975 + bphy_err(drvr, "Failed to reserve space in commonring\n");
976 brcmf_commonring_unlock(commonring);
979 @@ -1029,7 +1033,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
980 skb = brcmu_pkt_buf_get_skb(BRCMF_MSGBUF_MAX_PKT_SIZE);
983 - brcmf_err("Failed to alloc SKB\n");
984 + bphy_err(drvr, "Failed to alloc SKB\n");
985 brcmf_commonring_write_cancel(commonring, alloced - i);
988 @@ -1039,7 +1043,7 @@ brcmf_msgbuf_rxbuf_ctrl_post(struct brcm
989 msgbuf->rx_pktids, skb, 0,
990 &physaddr, &pktid)) {
991 dev_kfree_skb_any(skb);
992 - brcmf_err("No PKTID available !!\n");
993 + bphy_err(drvr, "No PKTID available !!\n");
994 brcmf_commonring_write_cancel(commonring, alloced - i);
997 @@ -1091,6 +1095,7 @@ static void brcmf_msgbuf_rxbuf_event_pos
999 static void brcmf_msgbuf_process_event(struct brcmf_msgbuf *msgbuf, void *buf)
1001 + struct brcmf_pub *drvr = msgbuf->drvr;
1002 struct msgbuf_rx_event *event;
1005 @@ -1117,8 +1122,8 @@ static void brcmf_msgbuf_process_event(s
1007 ifp = brcmf_get_ifp(msgbuf->drvr, event->msg.ifidx);
1008 if (!ifp || !ifp->ndev) {
1009 - brcmf_err("Received pkt for invalid ifidx %d\n",
1010 - event->msg.ifidx);
1011 + bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
1012 + event->msg.ifidx);
1016 @@ -1134,6 +1139,7 @@ exit:
1018 brcmf_msgbuf_process_rx_complete(struct brcmf_msgbuf *msgbuf, void *buf)
1020 + struct brcmf_pub *drvr = msgbuf->drvr;
1021 struct msgbuf_rx_complete *rx_complete;
1022 struct sk_buff *skb;
1024 @@ -1167,7 +1173,7 @@ brcmf_msgbuf_process_rx_complete(struct
1025 ifp = msgbuf->drvr->mon_if;
1028 - brcmf_err("Received unexpected monitor pkt\n");
1029 + bphy_err(drvr, "Received unexpected monitor pkt\n");
1030 brcmu_pkt_buf_free_skb(skb);
1033 @@ -1178,8 +1184,8 @@ brcmf_msgbuf_process_rx_complete(struct
1035 ifp = brcmf_get_ifp(msgbuf->drvr, rx_complete->msg.ifidx);
1036 if (!ifp || !ifp->ndev) {
1037 - brcmf_err("Received pkt for invalid ifidx %d\n",
1038 - rx_complete->msg.ifidx);
1039 + bphy_err(drvr, "Received pkt for invalid ifidx %d\n",
1040 + rx_complete->msg.ifidx);
1041 brcmu_pkt_buf_free_skb(skb);
1044 @@ -1192,13 +1198,15 @@ static void brcmf_msgbuf_process_ring_st
1047 struct msgbuf_ring_status *ring_status = buf;
1048 + struct brcmf_pub *drvr = msgbuf->drvr;
1051 err = le16_to_cpu(ring_status->compl_hdr.status);
1053 int ring = le16_to_cpu(ring_status->compl_hdr.flow_ring_id);
1055 - brcmf_err("Firmware reported ring %d error: %d\n", ring, err);
1056 + bphy_err(drvr, "Firmware reported ring %d error: %d\n", ring,
1061 @@ -1206,6 +1214,7 @@ static void
1062 brcmf_msgbuf_process_flow_ring_create_response(struct brcmf_msgbuf *msgbuf,
1065 + struct brcmf_pub *drvr = msgbuf->drvr;
1066 struct msgbuf_flowring_create_resp *flowring_create_resp;
1069 @@ -1217,7 +1226,7 @@ brcmf_msgbuf_process_flow_ring_create_re
1070 status = le16_to_cpu(flowring_create_resp->compl_hdr.status);
1073 - brcmf_err("Flowring creation failed, code %d\n", status);
1074 + bphy_err(drvr, "Flowring creation failed, code %d\n", status);
1075 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1078 @@ -1234,6 +1243,7 @@ static void
1079 brcmf_msgbuf_process_flow_ring_delete_response(struct brcmf_msgbuf *msgbuf,
1082 + struct brcmf_pub *drvr = msgbuf->drvr;
1083 struct msgbuf_flowring_delete_resp *flowring_delete_resp;
1086 @@ -1245,7 +1255,7 @@ brcmf_msgbuf_process_flow_ring_delete_re
1087 status = le16_to_cpu(flowring_delete_resp->compl_hdr.status);
1090 - brcmf_err("Flowring deletion failed, code %d\n", status);
1091 + bphy_err(drvr, "Flowring deletion failed, code %d\n", status);
1092 brcmf_flowring_delete(msgbuf->flow, flowid);
1095 @@ -1258,6 +1268,7 @@ brcmf_msgbuf_process_flow_ring_delete_re
1097 static void brcmf_msgbuf_process_msgtype(struct brcmf_msgbuf *msgbuf, void *buf)
1099 + struct brcmf_pub *drvr = msgbuf->drvr;
1100 struct msgbuf_common_hdr *msg;
1102 msg = (struct msgbuf_common_hdr *)buf;
1103 @@ -1294,7 +1305,7 @@ static void brcmf_msgbuf_process_msgtype
1104 brcmf_msgbuf_process_rx_complete(msgbuf, buf);
1107 - brcmf_err("Unsupported msgtype %d\n", msg->msgtype);
1108 + bphy_err(drvr, "Unsupported msgtype %d\n", msg->msgtype);
1112 @@ -1377,7 +1388,7 @@ void brcmf_msgbuf_delete_flowring(struct
1113 brcmf_commonring_lock(commonring);
1114 ret_ptr = brcmf_commonring_reserve_for_write(commonring);
1116 - brcmf_err("FW unaware, flowring will be removed !!\n");
1117 + bphy_err(drvr, "FW unaware, flowring will be removed !!\n");
1118 brcmf_commonring_unlock(commonring);
1119 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1121 @@ -1401,7 +1412,7 @@ void brcmf_msgbuf_delete_flowring(struct
1122 err = brcmf_commonring_write_complete(commonring);
1123 brcmf_commonring_unlock(commonring);
1125 - brcmf_err("Failed to submit RING_DELETE, flowring will be removed\n");
1126 + bphy_err(drvr, "Failed to submit RING_DELETE, flowring will be removed\n");
1127 brcmf_msgbuf_remove_flowring(msgbuf, flowid);
1130 @@ -1476,8 +1487,8 @@ int brcmf_proto_msgbuf_attach(struct brc
1131 if_msgbuf = drvr->bus_if->msgbuf;
1133 if (if_msgbuf->max_flowrings >= BRCMF_FLOWRING_HASHSIZE) {
1134 - brcmf_err("driver not configured for this many flowrings %d\n",
1135 - if_msgbuf->max_flowrings);
1136 + bphy_err(drvr, "driver not configured for this many flowrings %d\n",
1137 + if_msgbuf->max_flowrings);
1138 if_msgbuf->max_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
1141 @@ -1487,7 +1498,7 @@ int brcmf_proto_msgbuf_attach(struct brc
1143 msgbuf->txflow_wq = create_singlethread_workqueue("msgbuf_txflow");
1144 if (msgbuf->txflow_wq == NULL) {
1145 - brcmf_err("workqueue creation failed\n");
1146 + bphy_err(drvr, "workqueue creation failed\n");
1149 INIT_WORK(&msgbuf->txflow_work, brcmf_msgbuf_txflow_worker);
1150 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
1151 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
1152 @@ -434,6 +434,7 @@ static void brcmf_p2p_print_actframe(boo
1154 static int brcmf_p2p_set_firmware(struct brcmf_if *ifp, u8 *p2p_mac)
1156 + struct brcmf_pub *drvr = ifp->drvr;
1159 brcmf_fil_cmd_int_set(ifp, BRCMF_C_DOWN, 1);
1160 @@ -450,7 +451,7 @@ static int brcmf_p2p_set_firmware(struct
1161 ret = brcmf_fil_iovar_data_set(ifp, "p2p_da_override", p2p_mac,
1164 - brcmf_err("failed to update device address ret %d\n", ret);
1165 + bphy_err(drvr, "failed to update device address ret %d\n", ret);
1169 @@ -570,13 +571,14 @@ static s32 brcmf_p2p_deinit_discovery(st
1171 static int brcmf_p2p_enable_discovery(struct brcmf_p2p_info *p2p)
1173 + struct brcmf_pub *drvr = p2p->cfg->pub;
1174 struct brcmf_cfg80211_vif *vif;
1177 brcmf_dbg(TRACE, "enter\n");
1178 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1180 - brcmf_err("P2P config device not available\n");
1181 + bphy_err(drvr, "P2P config device not available\n");
1185 @@ -590,13 +592,13 @@ static int brcmf_p2p_enable_discovery(st
1186 vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
1187 ret = brcmf_fil_iovar_int_set(vif->ifp, "p2p_disc", 1);
1189 - brcmf_err("set p2p_disc error\n");
1190 + bphy_err(drvr, "set p2p_disc error\n");
1193 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1194 ret = brcmf_p2p_set_discover_state(vif->ifp, WL_P2P_DISC_ST_SCAN, 0, 0);
1196 - brcmf_err("unable to set WL_P2P_DISC_ST_SCAN\n");
1197 + bphy_err(drvr, "unable to set WL_P2P_DISC_ST_SCAN\n");
1201 @@ -608,7 +610,7 @@ static int brcmf_p2p_enable_discovery(st
1203 ret = brcmf_fil_bsscfg_int_set(vif->ifp, "wsec", AES_ENABLED);
1205 - brcmf_err("wsec error %d\n", ret);
1206 + bphy_err(drvr, "wsec error %d\n", ret);
1210 @@ -630,6 +632,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1211 u16 chanspecs[], s32 search_state,
1212 enum p2p_bss_type bss_type)
1214 + struct brcmf_pub *drvr = p2p->cfg->pub;
1216 s32 memsize = offsetof(struct brcmf_p2p_scan_le,
1217 eparams.params_le.channel_list);
1218 @@ -648,7 +651,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1220 vif = p2p->bss_idx[bss_type].vif;
1222 - brcmf_err("no vif for bss type %d\n", bss_type);
1223 + bphy_err(drvr, "no vif for bss type %d\n", bss_type);
1227 @@ -676,7 +679,7 @@ static s32 brcmf_p2p_escan(struct brcmf_
1228 BRCMF_P2P_WILDCARD_SSID_LEN);
1231 - brcmf_err(" invalid search state %d\n", search_state);
1232 + bphy_err(drvr, " invalid search state %d\n", search_state);
1236 @@ -760,6 +763,7 @@ static s32 brcmf_p2p_run_escan(struct br
1237 struct cfg80211_scan_request *request)
1239 struct brcmf_p2p_info *p2p = &cfg->p2p;
1240 + struct brcmf_pub *drvr = cfg->pub;
1242 s32 search_state = WL_P2P_DISC_ST_SCAN;
1243 struct brcmf_cfg80211_vif *vif;
1244 @@ -822,7 +826,7 @@ static s32 brcmf_p2p_run_escan(struct br
1248 - brcmf_err("error (%d)\n", err);
1249 + bphy_err(drvr, "error (%d)\n", err);
1253 @@ -917,19 +921,20 @@ int brcmf_p2p_scan_prep(struct wiphy *wi
1255 brcmf_p2p_discover_listen(struct brcmf_p2p_info *p2p, u16 channel, u32 duration)
1257 + struct brcmf_pub *drvr = p2p->cfg->pub;
1258 struct brcmf_cfg80211_vif *vif;
1259 struct brcmu_chan ch;
1262 vif = p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif;
1264 - brcmf_err("Discovery is not set, so we have nothing to do\n");
1265 + bphy_err(drvr, "Discovery is not set, so we have nothing to do\n");
1270 if (test_bit(BRCMF_P2P_STATUS_DISCOVER_LISTEN, &p2p->status)) {
1271 - brcmf_err("Previous LISTEN is not completed yet\n");
1272 + bphy_err(drvr, "Previous LISTEN is not completed yet\n");
1273 /* WAR: prevent cookie mismatch in wpa_supplicant return OK */
1276 @@ -1046,6 +1051,7 @@ void brcmf_p2p_cancel_remain_on_channel(
1278 static s32 brcmf_p2p_act_frm_search(struct brcmf_p2p_info *p2p, u16 channel)
1280 + struct brcmf_pub *drvr = p2p->cfg->pub;
1283 u16 *default_chan_list;
1284 @@ -1061,7 +1067,7 @@ static s32 brcmf_p2p_act_frm_search(stru
1285 default_chan_list = kcalloc(channel_cnt, sizeof(*default_chan_list),
1287 if (default_chan_list == NULL) {
1288 - brcmf_err("channel list allocation failed\n");
1289 + bphy_err(drvr, "channel list allocation failed\n");
1293 @@ -1103,6 +1109,7 @@ static void brcmf_p2p_afx_handler(struct
1294 struct brcmf_p2p_info *p2p = container_of(afx_hdl,
1295 struct brcmf_p2p_info,
1297 + struct brcmf_pub *drvr = p2p->cfg->pub;
1300 if (!afx_hdl->is_active)
1301 @@ -1116,7 +1123,7 @@ static void brcmf_p2p_afx_handler(struct
1302 err = brcmf_p2p_act_frm_search(p2p, afx_hdl->peer_listen_chan);
1305 - brcmf_err("ERROR occurred! value is (%d)\n", err);
1306 + bphy_err(drvr, "ERROR occurred! value is (%d)\n", err);
1307 if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
1309 complete(&afx_hdl->act_frm_scan);
1310 @@ -1338,7 +1345,8 @@ int brcmf_p2p_notify_action_frame_rx(str
1311 const struct brcmf_event_msg *e,
1314 - struct brcmf_cfg80211_info *cfg = ifp->drvr->config;
1315 + struct brcmf_pub *drvr = ifp->drvr;
1316 + struct brcmf_cfg80211_info *cfg = drvr->config;
1317 struct brcmf_p2p_info *p2p = &cfg->p2p;
1318 struct afx_hdl *afx_hdl = &p2p->afx_hdl;
1319 struct wireless_dev *wdev;
1320 @@ -1409,7 +1417,7 @@ int brcmf_p2p_notify_action_frame_rx(str
1321 mgmt_frame = kzalloc(offsetof(struct ieee80211_mgmt, u) +
1322 mgmt_frame_len, GFP_KERNEL);
1324 - brcmf_err("No memory available for action frame\n");
1325 + bphy_err(drvr, "No memory available for action frame\n");
1328 memcpy(mgmt_frame->da, ifp->mac_addr, ETH_ALEN);
1329 @@ -1492,6 +1500,7 @@ int brcmf_p2p_notify_action_tx_complete(
1330 static s32 brcmf_p2p_tx_action_frame(struct brcmf_p2p_info *p2p,
1331 struct brcmf_fil_af_params_le *af_params)
1333 + struct brcmf_pub *drvr = p2p->cfg->pub;
1334 struct brcmf_cfg80211_vif *vif;
1337 @@ -1506,7 +1515,7 @@ static s32 brcmf_p2p_tx_action_frame(str
1338 err = brcmf_fil_bsscfg_data_set(vif->ifp, "actframe", af_params,
1339 sizeof(*af_params));
1341 - brcmf_err(" sending action frame has failed\n");
1342 + bphy_err(drvr, " sending action frame has failed\n");
1346 @@ -1556,6 +1565,7 @@ static s32 brcmf_p2p_pub_af_tx(struct br
1347 struct brcmf_config_af_params *config_af_params)
1349 struct brcmf_p2p_info *p2p = &cfg->p2p;
1350 + struct brcmf_pub *drvr = cfg->pub;
1351 struct brcmf_fil_action_frame_le *action_frame;
1352 struct brcmf_p2p_pub_act_frame *act_frm;
1354 @@ -1634,8 +1644,8 @@ static s32 brcmf_p2p_pub_af_tx(struct br
1355 config_af_params->extra_listen = false;
1358 - brcmf_err("Unknown p2p pub act frame subtype: %d\n",
1359 - act_frm->subtype);
1360 + bphy_err(drvr, "Unknown p2p pub act frame subtype: %d\n",
1361 + act_frm->subtype);
1365 @@ -1657,6 +1667,7 @@ bool brcmf_p2p_send_action_frame(struct
1366 struct brcmf_fil_action_frame_le *action_frame;
1367 struct brcmf_config_af_params config_af_params;
1368 struct afx_hdl *afx_hdl = &p2p->afx_hdl;
1369 + struct brcmf_pub *drvr = cfg->pub;
1370 u16 action_frame_len;
1373 @@ -1692,7 +1703,7 @@ bool brcmf_p2p_send_action_frame(struct
1374 if (brcmf_p2p_pub_af_tx(cfg, af_params, &config_af_params)) {
1375 /* Just send unknown subtype frame with */
1376 /* default parameters. */
1377 - brcmf_err("P2P Public action frame, unknown subtype.\n");
1378 + bphy_err(drvr, "P2P Public action frame, unknown subtype.\n");
1380 } else if (brcmf_p2p_is_gas_action(action_frame->data,
1381 action_frame_len)) {
1382 @@ -1714,7 +1725,7 @@ bool brcmf_p2p_send_action_frame(struct
1383 af_params->dwell_time =
1384 cpu_to_le32(P2P_AF_MIN_DWELL_TIME);
1386 - brcmf_err("Unknown action type: %d\n", action);
1387 + bphy_err(drvr, "Unknown action type: %d\n", action);
1390 } else if (brcmf_p2p_is_p2p_action(action_frame->data,
1391 @@ -1722,8 +1733,8 @@ bool brcmf_p2p_send_action_frame(struct
1392 /* do not configure anything. it will be */
1393 /* sent with a default configuration */
1395 - brcmf_err("Unknown Frame: category 0x%x, action 0x%x\n",
1396 - category, action);
1397 + bphy_err(drvr, "Unknown Frame: category 0x%x, action 0x%x\n",
1398 + category, action);
1402 @@ -1761,7 +1772,7 @@ bool brcmf_p2p_send_action_frame(struct
1404 if (brcmf_p2p_af_searching_channel(p2p) ==
1405 P2P_INVALID_CHANNEL) {
1406 - brcmf_err("Couldn't find peer's channel.\n");
1407 + bphy_err(drvr, "Couldn't find peer's channel.\n");
1411 @@ -1783,7 +1794,8 @@ bool brcmf_p2p_send_action_frame(struct
1415 - brcmf_err("Failed to send Action Frame(retry %d)\n", tx_retry);
1416 + bphy_err(drvr, "Failed to send Action Frame(retry %d)\n",
1418 clear_bit(BRCMF_P2P_STATUS_GO_NEG_PHASE, &p2p->status);
1421 @@ -1965,6 +1977,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1422 enum brcmf_fil_p2p_if_types if_type)
1424 struct brcmf_p2p_info *p2p = &cfg->p2p;
1425 + struct brcmf_pub *drvr = cfg->pub;
1426 struct brcmf_cfg80211_vif *vif;
1427 struct brcmf_fil_p2p_if_le if_request;
1429 @@ -1974,13 +1987,13 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1431 vif = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif;
1433 - brcmf_err("vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
1434 + bphy_err(drvr, "vif for P2PAPI_BSSCFG_PRIMARY does not exist\n");
1437 brcmf_notify_escan_complete(cfg, vif->ifp, true, true);
1438 vif = p2p->bss_idx[P2PAPI_BSSCFG_CONNECTION].vif;
1440 - brcmf_err("vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
1441 + bphy_err(drvr, "vif for P2PAPI_BSSCFG_CONNECTION does not exist\n");
1444 brcmf_set_mpc(vif->ifp, 0);
1445 @@ -1998,7 +2011,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1446 err = brcmf_fil_iovar_data_set(vif->ifp, "p2p_ifupd", &if_request,
1447 sizeof(if_request));
1449 - brcmf_err("p2p_ifupd FAILED, err=%d\n", err);
1450 + bphy_err(drvr, "p2p_ifupd FAILED, err=%d\n", err);
1451 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1454 @@ -2006,7 +2019,7 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
1455 BRCMF_VIF_EVENT_TIMEOUT);
1456 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1458 - brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
1459 + bphy_err(drvr, "No BRCMF_E_IF_CHANGE event received\n");
1463 @@ -2069,6 +2082,7 @@ static struct wireless_dev *brcmf_p2p_cr
1464 struct wiphy *wiphy,
1467 + struct brcmf_pub *drvr = p2p->cfg->pub;
1468 struct brcmf_cfg80211_vif *p2p_vif;
1469 struct brcmf_if *p2p_ifp;
1470 struct brcmf_if *pri_ifp;
1471 @@ -2080,7 +2094,7 @@ static struct wireless_dev *brcmf_p2p_cr
1473 p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE);
1474 if (IS_ERR(p2p_vif)) {
1475 - brcmf_err("could not create discovery vif\n");
1476 + bphy_err(drvr, "could not create discovery vif\n");
1477 return (struct wireless_dev *)p2p_vif;
1480 @@ -2088,7 +2102,7 @@ static struct wireless_dev *brcmf_p2p_cr
1482 /* firmware requires unique mac address for p2pdev interface */
1483 if (addr && ether_addr_equal(addr, pri_ifp->mac_addr)) {
1484 - brcmf_err("discovery vif must be different from primary interface\n");
1485 + bphy_err(drvr, "discovery vif must be different from primary interface\n");
1486 return ERR_PTR(-EINVAL);
1489 @@ -2101,7 +2115,7 @@ static struct wireless_dev *brcmf_p2p_cr
1490 /* Initialize P2P Discovery in the firmware */
1491 err = brcmf_fil_iovar_int_set(pri_ifp, "p2p_disc", 1);
1493 - brcmf_err("set p2p_disc error\n");
1494 + bphy_err(drvr, "set p2p_disc error\n");
1495 brcmf_fweh_p2pdev_setup(pri_ifp, false);
1496 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
1498 @@ -2113,7 +2127,7 @@ static struct wireless_dev *brcmf_p2p_cr
1499 brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
1500 brcmf_fweh_p2pdev_setup(pri_ifp, false);
1502 - brcmf_err("timeout occurred\n");
1503 + bphy_err(drvr, "timeout occurred\n");
1507 @@ -2127,7 +2141,7 @@ static struct wireless_dev *brcmf_p2p_cr
1508 /* verify bsscfg index for P2P discovery */
1509 err = brcmf_fil_iovar_int_get(pri_ifp, "p2p_dev", &bsscfgidx);
1511 - brcmf_err("retrieving discover bsscfg index failed\n");
1512 + bphy_err(drvr, "retrieving discover bsscfg index failed\n");
1516 @@ -2161,6 +2175,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1518 struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
1519 struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
1520 + struct brcmf_pub *drvr = cfg->pub;
1521 struct brcmf_cfg80211_vif *vif;
1522 enum brcmf_fil_p2p_if_types iftype;
1524 @@ -2201,7 +2216,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1525 BRCMF_VIF_EVENT_TIMEOUT);
1526 brcmf_cfg80211_arm_vif_event(cfg, NULL);
1528 - brcmf_err("timeout occurred\n");
1529 + bphy_err(drvr, "timeout occurred\n");
1533 @@ -2209,7 +2224,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1534 /* interface created in firmware */
1537 - brcmf_err("no if pointer provided\n");
1538 + bphy_err(drvr, "no if pointer provided\n");
1542 @@ -2220,7 +2235,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
1543 #endif /* >= 3.17.0 */
1544 err = brcmf_net_attach(ifp, true);
1546 - brcmf_err("Registering netdevice failed\n");
1547 + bphy_err(drvr, "Registering netdevice failed\n");
1548 free_netdev(ifp->ndev);
1551 @@ -2375,6 +2390,7 @@ void brcmf_p2p_stop_device(struct wiphy
1553 s32 brcmf_p2p_attach(struct brcmf_cfg80211_info *cfg, bool p2pdev_forced)
1555 + struct brcmf_pub *drvr = cfg->pub;
1556 struct brcmf_p2p_info *p2p;
1557 struct brcmf_if *pri_ifp;
1559 @@ -2389,7 +2405,7 @@ s32 brcmf_p2p_attach(struct brcmf_cfg802
1560 if (p2pdev_forced) {
1561 err_ptr = brcmf_p2p_create_p2pdev(p2p, NULL, NULL);
1562 if (IS_ERR(err_ptr)) {
1563 - brcmf_err("P2P device creation failed.\n");
1564 + bphy_err(drvr, "P2P device creation failed.\n");
1565 err = PTR_ERR(err_ptr);
1568 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
1569 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
1570 @@ -109,6 +109,7 @@ static int brcmf_pno_channel_config(stru
1571 static int brcmf_pno_config(struct brcmf_if *ifp, u32 scan_freq,
1572 u32 mscan, u32 bestn)
1574 + struct brcmf_pub *drvr = ifp->drvr;
1575 struct brcmf_pno_param_le pfn_param;
1578 @@ -132,13 +133,13 @@ static int brcmf_pno_config(struct brcmf
1579 /* set bestn in firmware */
1580 err = brcmf_fil_iovar_int_set(ifp, "pfnmem", pfnmem);
1582 - brcmf_err("failed to set pfnmem\n");
1583 + bphy_err(drvr, "failed to set pfnmem\n");
1586 /* get max mscan which the firmware supports */
1587 err = brcmf_fil_iovar_int_get(ifp, "pfnmem", &pfnmem);
1589 - brcmf_err("failed to get pfnmem\n");
1590 + bphy_err(drvr, "failed to get pfnmem\n");
1593 mscan = min_t(u32, mscan, pfnmem);
1594 @@ -152,7 +153,7 @@ static int brcmf_pno_config(struct brcmf
1595 err = brcmf_fil_iovar_data_set(ifp, "pfn_set", &pfn_param,
1598 - brcmf_err("pfn_set failed, err=%d\n", err);
1599 + bphy_err(drvr, "pfn_set failed, err=%d\n", err);
1603 @@ -160,6 +161,7 @@ exit:
1605 static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi)
1607 + struct brcmf_pub *drvr = ifp->drvr;
1608 struct brcmf_pno_macaddr_le pfn_mac;
1609 u8 *mac_addr = NULL;
1610 u8 *mac_mask = NULL;
1611 @@ -194,7 +196,7 @@ static int brcmf_pno_set_random(struct b
1612 err = brcmf_fil_iovar_data_set(ifp, "pfn_macaddr", &pfn_mac,
1615 - brcmf_err("pfn_macaddr failed, err=%d\n", err);
1616 + bphy_err(drvr, "pfn_macaddr failed, err=%d\n", err);
1620 @@ -202,6 +204,7 @@ static int brcmf_pno_set_random(struct b
1621 static int brcmf_pno_add_ssid(struct brcmf_if *ifp, struct cfg80211_ssid *ssid,
1624 + struct brcmf_pub *drvr = ifp->drvr;
1625 struct brcmf_pno_net_param_le pfn;
1628 @@ -218,12 +221,13 @@ static int brcmf_pno_add_ssid(struct brc
1629 brcmf_dbg(SCAN, "adding ssid=%.32s (active=%d)\n", ssid->ssid, active);
1630 err = brcmf_fil_iovar_data_set(ifp, "pfn_add", &pfn, sizeof(pfn));
1632 - brcmf_err("adding failed: err=%d\n", err);
1633 + bphy_err(drvr, "adding failed: err=%d\n", err);
1637 static int brcmf_pno_add_bssid(struct brcmf_if *ifp, const u8 *bssid)
1639 + struct brcmf_pub *drvr = ifp->drvr;
1640 struct brcmf_pno_bssid_le bssid_cfg;
1643 @@ -234,7 +238,7 @@ static int brcmf_pno_add_bssid(struct br
1644 err = brcmf_fil_iovar_data_set(ifp, "pfn_add_bssid", &bssid_cfg,
1647 - brcmf_err("adding failed: err=%d\n", err);
1648 + bphy_err(drvr, "adding failed: err=%d\n", err);
1652 @@ -258,6 +262,7 @@ static bool brcmf_is_ssid_active(struct
1654 static int brcmf_pno_clean(struct brcmf_if *ifp)
1656 + struct brcmf_pub *drvr = ifp->drvr;
1660 @@ -267,7 +272,7 @@ static int brcmf_pno_clean(struct brcmf_
1661 ret = brcmf_fil_iovar_data_set(ifp, "pfnclear", NULL, 0);
1664 - brcmf_err("failed code %d\n", ret);
1665 + bphy_err(drvr, "failed code %d\n", ret);
1669 @@ -392,6 +397,7 @@ static int brcmf_pno_config_networks(str
1671 static int brcmf_pno_config_sched_scans(struct brcmf_if *ifp)
1673 + struct brcmf_pub *drvr = ifp->drvr;
1674 struct brcmf_pno_info *pi;
1675 struct brcmf_gscan_config *gscan_cfg;
1676 struct brcmf_gscan_bucket_config *buckets;
1677 @@ -416,7 +422,7 @@ static int brcmf_pno_config_sched_scans(
1678 /* clean up everything */
1679 err = brcmf_pno_clean(ifp);
1681 - brcmf_err("failed error=%d\n", err);
1682 + bphy_err(drvr, "failed error=%d\n", err);
1686 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
1687 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.c
1688 @@ -47,8 +47,8 @@ int brcmf_proto_attach(struct brcmf_pub
1689 if (brcmf_proto_msgbuf_attach(drvr))
1692 - brcmf_err("Unsupported proto type %d\n",
1693 - drvr->bus_if->proto_type);
1694 + bphy_err(drvr, "Unsupported proto type %d\n",
1695 + drvr->bus_if->proto_type);
1698 if (!proto->tx_queue_data || (proto->hdrpull == NULL) ||
1699 @@ -56,7 +56,7 @@ int brcmf_proto_attach(struct brcmf_pub
1700 (proto->configure_addr_mode == NULL) ||
1701 (proto->delete_peer == NULL) || (proto->add_tdls_peer == NULL) ||
1702 (proto->debugfs_create == NULL)) {
1703 - brcmf_err("Not all proto handlers have been installed\n");
1704 + bphy_err(drvr, "Not all proto handlers have been installed\n");