diff options
| author |   Jon Mason <jon.mason@broadcom.com> | 2016-07-07 19:08:53 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-07-09 18:10:40 -0400 |
| commit | d00a8281bcc962027dfe409c2f3e3f0546be9200 (patch) | |
| tree | e0ecb0467fd9d528fff06659224d84569d644644 /drivers/net/ethernet/broadcom/bgmac.h | |
| parent | net: tracepoint napi:napi_poll add work and budget (diff) | |
| download | linux-dev-d00a8281bcc962027dfe409c2f3e3f0546be9200.tar.xz linux-dev-d00a8281bcc962027dfe409c2f3e3f0546be9200.zip | |
net: ethernet: bgmac: change bgmac_* prints to dev_* prints
The bgmac_* print wrappers call dev_* prints with the dev pointer from
the bcma core. In anticipation of removing the bcma requirement for
this driver, these must be changed to not reference that struct. So,
simply change all of the bgmac_* prints to their dev_* counterparts. In
some cases netdev_* prints are more appropriate, so change those as
well.
Signed-off-by: Jon Mason <jon.mason@broadcom.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bgmac.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/net/ethernet/broadcom/bgmac.h b/drivers/net/ethernet/broadcom/bgmac.h index 99beb181f577..abb9dd854180 100644 --- a/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h @@ -1,17 +1,6 @@ #ifndef _BGMAC_H #define _BGMAC_H -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -#define bgmac_err(bgmac, fmt, ...) \ - dev_err(&(bgmac)->core->dev, fmt, ##__VA_ARGS__) -#define bgmac_warn(bgmac, fmt, ...) \ - dev_warn(&(bgmac)->core->dev, fmt, ##__VA_ARGS__) -#define bgmac_info(bgmac, fmt, ...) \ - dev_info(&(bgmac)->core->dev, fmt, ##__VA_ARGS__) -#define bgmac_dbg(bgmac, fmt, ...) \ - dev_dbg(&(bgmac)->core->dev, fmt, ##__VA_ARGS__) - #include <linux/bcma/bcma.h> #include <linux/brcmphy.h> #include <linux/netdevice.h> @@ -438,6 +427,8 @@ struct bgmac_rx_header { struct bgmac { struct bcma_device *core; struct bcma_device *cmn; /* Reference to CMN core for BCM4706 */ + + struct device *dev; struct net_device *net_dev; struct napi_struct napi; struct mii_bus *mii_bus; @@ -489,5 +480,4 @@ static inline void bgmac_set(struct bgmac *bgmac, u16 offset, u32 set) { bgmac_maskset(bgmac, offset, ~0, set); } - #endif /* _BGMAC_H */ |