diff mbox

[2/6] brcmfmac: add struct brcmf_pub parameter to the __brcmf_err

Message ID 20170124150612.25138-2-zajec5@gmail.com (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show

Commit Message

Rafał Miłecki Jan. 24, 2017, 3:06 p.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

This will allow getting struct device reference from the passed
brcmf_pub for the needs of dev_err. More detailed messages are really
important for home routers which frequently have 2 (or even 3) wireless
cards supported by brcmfmac.

Note that all calls are yet to be updated as for now brcmf_err macro
always passes NULL. This will be handled in following patch to make this
change easier to review.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c     | 2 +-
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h      | 9 +++++----
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

Comments

kernel test robot Jan. 24, 2017, 11:41 p.m. UTC | #1 
Hi Rafał,

[auto build test ERROR on wireless-drivers-next/master]
[also build test ERROR on v4.10-rc5 next-20170124]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Rafa-Mi-ecki/brcmfmac-switch-to-C-function-__brcmf_err-for-printing-errors/20170125-033714
base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: i386-randconfig-h1-01250553 (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All error/warnings (new ones prefixed by >>):

   In file included from drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c:21:0:
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:81:24: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     int (*preinit)(struct device *dev);
                           ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:82:22: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     void (*stop)(struct device *dev);
                         ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:83:23: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     int (*txdata)(struct device *dev, struct sk_buff *skb);
                          ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:84:22: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     int (*txctl)(struct device *dev, unsigned char *msg, uint len);
                         ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:85:22: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     int (*rxctl)(struct device *dev, unsigned char *msg, uint len);
                         ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:86:33: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     struct pktq * (*gettxq)(struct device *dev);
                                    ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:87:29: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     void (*wowl_config)(struct device *dev, bool enabled);
                                ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:88:31: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     size_t (*get_ramsize)(struct device *dev);
                                  ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:89:28: warning: 'struct device' declared inside parameter list will not be visible outside of this definition or declaration
     int (*get_memdump)(struct device *dev, void *data, size_t len);
                               ^~~~~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_preinit':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:159:27: error: passing argument 1 of 'bus->ops->preinit' from incompatible pointer type [-Werror=incompatible-pointer-types]
     return bus->ops->preinit(bus->dev);
                              ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:159:27: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_stop':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:164:17: error: passing argument 1 of 'bus->ops->stop' from incompatible pointer type [-Werror=incompatible-pointer-types]
     bus->ops->stop(bus->dev);
                    ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:164:17: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_txdata':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:169:26: error: passing argument 1 of 'bus->ops->txdata' from incompatible pointer type [-Werror=incompatible-pointer-types]
     return bus->ops->txdata(bus->dev, skb);
                             ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:169:26: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_txctl':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:175:25: error: passing argument 1 of 'bus->ops->txctl' from incompatible pointer type [-Werror=incompatible-pointer-types]
     return bus->ops->txctl(bus->dev, msg, len);
                            ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:175:25: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_rxctl':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:181:25: error: passing argument 1 of 'bus->ops->rxctl' from incompatible pointer type [-Werror=incompatible-pointer-types]
     return bus->ops->rxctl(bus->dev, msg, len);
                            ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:181:25: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_gettxq':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:190:26: error: passing argument 1 of 'bus->ops->gettxq' from incompatible pointer type [-Werror=incompatible-pointer-types]
     return bus->ops->gettxq(bus->dev);
                             ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:190:26: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_wowl_config':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:197:25: error: passing argument 1 of 'bus->ops->wowl_config' from incompatible pointer type [-Werror=incompatible-pointer-types]
      bus->ops->wowl_config(bus->dev, enabled);
                            ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:197:25: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_get_ramsize':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:205:31: error: passing argument 1 of 'bus->ops->get_ramsize' from incompatible pointer type [-Werror=incompatible-pointer-types]
     return bus->ops->get_ramsize(bus->dev);
                                  ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:205:31: note: expected 'struct device *' but argument is of type 'struct device *'
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h: In function 'brcmf_bus_get_memdump':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:214:31: error: passing argument 1 of 'bus->ops->get_memdump' from incompatible pointer type [-Werror=incompatible-pointer-types]
     return bus->ops->get_memdump(bus->dev, data, len);
                                  ^~~
   drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h:214:31: note: expected 'struct device *' but argument is of type 'struct device *'
   cc1: some warnings being treated as errors

vim +159 drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h

d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   75   * This structure provides an abstract interface towards the
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   76   * bus specific driver. For control messages to common driver
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03   77   * will assure there is only one active transaction. Unless
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03   78   * indicated otherwise these callbacks are mandatory.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   79   */
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   80  struct brcmf_bus_ops {
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29  @81  	int (*preinit)(struct device *dev);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   82  	void (*stop)(struct device *dev);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   83  	int (*txdata)(struct device *dev, struct sk_buff *skb);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   84  	int (*txctl)(struct device *dev, unsigned char *msg, uint len);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   85  	int (*rxctl)(struct device *dev, unsigned char *msg, uint len);
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03   86  	struct pktq * (*gettxq)(struct device *dev);
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30   87  	void (*wowl_config)(struct device *dev, bool enabled);
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  @88  	size_t (*get_ramsize)(struct device *dev);
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  @89  	int (*get_memdump)(struct device *dev, void *data, size_t len);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   90  };
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05   91  
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   92  
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   93  /**
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   94   * struct brcmf_bus_msgbuf - bus ringbuf if in case of msgbuf.
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   95   *
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   96   * @commonrings: commonrings which are always there.
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   97   * @flowrings: commonrings which are dynamically created and destroyed for data.
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   98   * @rx_dataoffset: if set then all rx data has this this offset.
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30   99   * @max_rxbufpost: maximum number of buffers to post for rx.
be4b092c drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Franky Lin       2016-11-23  100   * @max_flowrings: maximum number of tx flow rings supported.
be4b092c drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Franky Lin       2016-11-23  101   * @max_submissionrings: maximum number of submission rings(h2d) supported.
be4b092c drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Franky Lin       2016-11-23  102   * @max_completionrings: maximum number of completion rings(d2h) supported.
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  103   */
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  104  struct brcmf_bus_msgbuf {
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  105  	struct brcmf_commonring *commonrings[BRCMF_NROF_COMMON_MSGRINGS];
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  106  	struct brcmf_commonring **flowrings;
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  107  	u32 rx_dataoffset;
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  108  	u32 max_rxbufpost;
be4b092c drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Franky Lin       2016-11-23  109  	u16 max_flowrings;
be4b092c drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Franky Lin       2016-11-23  110  	u16 max_submissionrings;
be4b092c drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Franky Lin       2016-11-23  111  	u16 max_completionrings;
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  112  };
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  113  
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  114  
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  115  /**
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  116   * struct brcmf_bus - interface structure between common and bus layer
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  117   *
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  118   * @bus_priv: pointer to private bus device.
943258b6 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2013-12-12  119   * @proto_type: protocol type, bcdc or msgbuf
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  120   * @dev: device pointer of bus device.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  121   * @drvr: public driver information.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  122   * @state: operational state of the bus interface.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  123   * @maxctl: maximum size for rxctl request message.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  124   * @tx_realloc: number of tx packets realloced for headroom.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  125   * @dstats: dongle-based statistical data.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  126   * @dcmd_list: bus/device specific dongle initialization commands.
75d907d3 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-02-06  127   * @chip: device identifier of the dongle chip.
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  128   * @wowl_supported: is wowl supported by bus driver.
75d907d3 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-02-06  129   * @chiprev: revision of the dongle chip.
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  130   */
a8a363ac drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Franky Lin       2011-12-16  131  struct brcmf_bus {
0a332e46 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-02-09  132  	union {
0a332e46 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-02-09  133  		struct brcmf_sdio_dev *sdio;
71bb244b drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-02-09  134  		struct brcmf_usbdev *usb;
9e37f045 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  135  		struct brcmf_pciedev *pcie;
0a332e46 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-02-09  136  	} bus_priv;
943258b6 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2013-12-12  137  	enum brcmf_bus_protocol_type proto_type;
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  138  	struct device *dev;
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  139  	struct brcmf_pub *drvr;
a8a363ac drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Franky Lin       2011-12-16  140  	enum brcmf_bus_state state;
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  141  	uint maxctl;
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  142  	unsigned long tx_realloc;
75d907d3 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-02-06  143  	u32 chip;
75d907d3 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-02-06  144  	u32 chiprev;
9cd18359 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-05-12  145  	bool always_use_fws_queue;
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  146  	bool wowl_supported;
a8a363ac drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Franky Lin       2011-12-16  147  
6866a64a drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h Julia Lawall     2015-11-14  148  	const struct brcmf_bus_ops *ops;
9a1bb602 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-07-30  149  	struct brcmf_bus_msgbuf *msgbuf;
a8a363ac drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Franky Lin       2011-12-16  150  };
a8a363ac drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Franky Lin       2011-12-16  151  
a8a363ac drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Franky Lin       2011-12-16  152  /*
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  153   * callback wrappers
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  154   */
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29  155  static inline int brcmf_bus_preinit(struct brcmf_bus *bus)
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29  156  {
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29  157  	if (!bus->ops->preinit)
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29  158  		return 0;
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29 @159  	return bus->ops->preinit(bus->dev);
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29  160  }
cf458287 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-11-29  161  
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  162  static inline void brcmf_bus_stop(struct brcmf_bus *bus)
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  163  {
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05 @164  	bus->ops->stop(bus->dev);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  165  }
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  166  
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  167  static inline int brcmf_bus_txdata(struct brcmf_bus *bus, struct sk_buff *skb)
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  168  {
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05 @169  	return bus->ops->txdata(bus->dev, skb);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  170  }
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  171  
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  172  static inline
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  173  int brcmf_bus_txctl(struct brcmf_bus *bus, unsigned char *msg, uint len)
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  174  {
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05 @175  	return bus->ops->txctl(bus->dev, msg, len);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  176  }
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  177  
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  178  static inline
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  179  int brcmf_bus_rxctl(struct brcmf_bus *bus, unsigned char *msg, uint len)
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  180  {
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05 @181  	return bus->ops->rxctl(bus->dev, msg, len);
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  182  }
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  183  
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03  184  static inline
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03  185  struct pktq *brcmf_bus_gettxq(struct brcmf_bus *bus)
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03  186  {
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03  187  	if (!bus->ops->gettxq)
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03  188  		return ERR_PTR(-ENOENT);
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03  189  
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03 @190  	return bus->ops->gettxq(bus->dev);
e2432b67 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2013-04-03  191  }
bb350711 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2014-01-13  192  
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  193  static inline
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  194  void brcmf_bus_wowl_config(struct brcmf_bus *bus, bool enabled)
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  195  {
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  196  	if (bus->ops->wowl_config)
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30 @197  		bus->ops->wowl_config(bus->dev, enabled);
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  198  }
4eb3af7c drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Hante Meuleman   2014-09-30  199  
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  200  static inline size_t brcmf_bus_get_ramsize(struct brcmf_bus *bus)
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  201  {
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  202  	if (!bus->ops->get_ramsize)
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  203  		return 0;
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  204  
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08 @205  	return bus->ops->get_ramsize(bus->dev);
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  206  }
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  207  
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  208  static inline
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  209  int brcmf_bus_get_memdump(struct brcmf_bus *bus, void *data, size_t len)
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  210  {
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  211  	if (!bus->ops->get_memdump)
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  212  		return -EOPNOTSUPP;
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  213  
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08 @214  	return bus->ops->get_memdump(bus->dev, data, len);
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  215  }
ff4445a8 drivers/net/wireless/brcm80211/brcmfmac/bus.h          Arend van Spriel 2015-10-08  216  
d9cb2596 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h      Arend van Spriel 2012-12-05  217  /*

:::::: The code at line 159 was first introduced by commit
:::::: cf4582875a77c13adf8fec79b8ab3896d2b38e97 brcmfmac: replace dongle command list with .preinit() callback

:::::: TO: Arend van Spriel <arend@broadcom.com>
:::::: CC: John W. Linville <linville@tuxdriver.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
index 05fb778ddd0f..0978fb4c9066 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -219,7 +219,7 @@  int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
 }
 
 #ifndef CONFIG_BRCM_TRACING
-void __brcmf_err(const char *func, const char *fmt, ...)
+void __brcmf_err(struct brcmf_pub *pub, const char *func, const char *fmt, ...)
 {
 	struct va_format vaf;
 	va_list args;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
index 5fef79473c87..012401e6be74 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h
@@ -19,6 +19,8 @@ 
 
 #include <linux/net.h>	/* net_ratelimit() */
 
+struct brcmf_pub;
+
 /* message levels */
 #define BRCMF_TRACE_VAL		0x00000002
 #define BRCMF_INFO_VAL		0x00000004
@@ -45,10 +47,10 @@ 
 #undef pr_fmt
 #define pr_fmt(fmt)		KBUILD_MODNAME ": " fmt
 
-__printf(2, 3)
-void __brcmf_err(const char *func, const char *fmt, ...);
+__printf(3, 4)
+void __brcmf_err(struct brcmf_pub *pub, const char *func, const char *fmt, ...);
 #define brcmf_err(fmt, ...) \
-	__brcmf_err(__func__, fmt, ##__VA_ARGS__)
+	__brcmf_err(NULL, __func__, fmt, ##__VA_ARGS__)
 
 #if defined(DEBUG) || defined(CONFIG_BRCM_TRACING)
 __printf(3, 4)
@@ -91,7 +93,6 @@  do {									\
 
 extern int brcmf_msg_level;
 
-struct brcmf_pub;
 #ifdef DEBUG
 void brcmf_debugfs_init(void);
 void brcmf_debugfs_exit(void);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
index fe6755944b7b..329cb65eb78b 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
@@ -18,10 +18,12 @@ 
 
 #ifndef __CHECKER__
 #define CREATE_TRACE_POINTS
+#include "bus.h"
+#include "core.h"
 #include "tracepoint.h"
 #include "debug.h"
 
-void __brcmf_err(const char *func, const char *fmt, ...)
+void __brcmf_err(struct brcmf_pub *pub, const char *func, const char *fmt, ...)
 {
 	struct va_format vaf = {
 		.fmt = fmt,