1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h
index 6f7612781e03..351b41d7f4fd 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debug.h
+++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -35,10 +35,10 @@
 struct iwl_priv;
 /*No matter what is m (priv, bus, trans), this will work */
-#define IWL_ERR(m, f, a...) dev_err(bus(m)->dev, f, ## a)
+#define IWL_ERR(m, f, a...) dev_err(trans(m)->dev, f, ## a)
-#define IWL_WARN(m, f, a...) dev_warn(bus(m)->dev, f, ## a)
+#define IWL_WARN(m, f, a...) dev_warn(trans(m)->dev, f, ## a)
-#define IWL_INFO(m, f, a...) dev_info(bus(m)->dev, f, ## a)
+#define IWL_INFO(m, f, a...) dev_info(trans(m)->dev, f, ## a)
-#define IWL_CRIT(m, f, a...) dev_crit(bus(m)->dev, f, ## a)
+#define IWL_CRIT(m, f, a...) dev_crit(trans(m)->dev, f, ## a)
 #define iwl_print_hex_error(m, p, len)                                  \
 do {                                                                    \
@@ -50,7 +50,7 @@ do {									\
 #define IWL_DEBUG(m, level, fmt, ...)                                   \
 do {                                                                    \
        if (iwl_get_debug_level((m)->shrd) & (level))                   \
-                dev_err(bus(m)->dev, "%c %s " fmt,                      \
+                dev_err(trans(m)->dev, "%c %s " fmt,                    \
                        in_interrupt() ? 'I' : 'U', __func__,           \
                        ##__VA_ARGS__);                                 \
 } while (0)
@@ -59,7 +59,7 @@ do {									\
 do {                                                                    \
        if (iwl_get_debug_level((m)->shrd) & (level) &&                 \
            net_ratelimit())                                            \
-                dev_err(bus(m)->dev, "%c %s " fmt,                      \
+                dev_err(trans(m)->dev, "%c %s " fmt,                    \
                        in_interrupt() ? 'I' : 'U', __func__,           \
                        ##__VA_ARGS__);                                 \
 } while (0)
@@ -74,12 +74,12 @@ do {                                            			\
 #define IWL_DEBUG_QUIET_RFKILL(p, fmt, ...)                             \
 do {                                                                    \
        if (!iwl_is_rfkill(p->shrd))                                    \
-                dev_err(bus(p)->dev, "%s%c %s " fmt,                    \
+                dev_err(trans(p)->dev, "%s%c %s " fmt,                  \
                        "",                                             \
                        in_interrupt() ? 'I' : 'U', __func__,           \
                        ##__VA_ARGS__);                                 \
        else if (iwl_get_debug_level(p->shrd) & IWL_DL_RADIO)           \
-                dev_err(bus(p)->dev, "%s%c %s " fmt,                    \
+                dev_err(trans(p)->dev, "%s%c %s " fmt,                  \
                        "(RFKILL) ",                                    \
                        in_interrupt() ? 'I' : 'U', __func__,           \
                        ##__VA_ARGS__);                                 \

diff --git a/drivers/net/wireless/iwlwifi/iwl-debug.h b/drivers/net/wireless/iwlwifi/iwl-debug.h index 6f7612781e03..351b41d7f4fd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debug.h +++ b/drivers/net/wireless/iwlwifi/iwl-debug.h
@@ -35,10 +35,10 @@
35	struct iwl_priv;	35	struct iwl_priv;
36		36
37	/No matter what is m (priv, bus, trans), this will work /	37	/No matter what is m (priv, bus, trans), this will work /
38	#define IWL_ERR(m, f, a...) dev_err(bus(m)->dev, f, ## a)	38	#define IWL_ERR(m, f, a...) dev_err(trans(m)->dev, f, ## a)
39	#define IWL_WARN(m, f, a...) dev_warn(bus(m)->dev, f, ## a)	39	#define IWL_WARN(m, f, a...) dev_warn(trans(m)->dev, f, ## a)
40	#define IWL_INFO(m, f, a...) dev_info(bus(m)->dev, f, ## a)	40	#define IWL_INFO(m, f, a...) dev_info(trans(m)->dev, f, ## a)
41	#define IWL_CRIT(m, f, a...) dev_crit(bus(m)->dev, f, ## a)	41	#define IWL_CRIT(m, f, a...) dev_crit(trans(m)->dev, f, ## a)
42		42
43	#define iwl_print_hex_error(m, p, len) \	43	#define iwl_print_hex_error(m, p, len) \
44	do { \	44	do { \
@@ -50,7 +50,7 @@ do { \
50	#define IWL_DEBUG(m, level, fmt, ...) \	50	#define IWL_DEBUG(m, level, fmt, ...) \
51	do { \	51	do { \
52	if (iwl_get_debug_level((m)->shrd) & (level)) \	52	if (iwl_get_debug_level((m)->shrd) & (level)) \
53	dev_err(bus(m)->dev, "%c %s " fmt, \	53	dev_err(trans(m)->dev, "%c %s " fmt, \
54	in_interrupt() ? 'I' : 'U', __func__, \	54	in_interrupt() ? 'I' : 'U', __func__, \
55	##__VA_ARGS__); \	55	##__VA_ARGS__); \
56	} while (0)	56	} while (0)
@@ -59,7 +59,7 @@ do { \
59	do { \	59	do { \
60	if (iwl_get_debug_level((m)->shrd) & (level) && \	60	if (iwl_get_debug_level((m)->shrd) & (level) && \
61	net_ratelimit()) \	61	net_ratelimit()) \
62	dev_err(bus(m)->dev, "%c %s " fmt, \	62	dev_err(trans(m)->dev, "%c %s " fmt, \
63	in_interrupt() ? 'I' : 'U', __func__, \	63	in_interrupt() ? 'I' : 'U', __func__, \
64	##__VA_ARGS__); \	64	##__VA_ARGS__); \
65	} while (0)	65	} while (0)
@@ -74,12 +74,12 @@ do { \
74	#define IWL_DEBUG_QUIET_RFKILL(p, fmt, ...) \	74	#define IWL_DEBUG_QUIET_RFKILL(p, fmt, ...) \
75	do { \	75	do { \
76	if (!iwl_is_rfkill(p->shrd)) \	76	if (!iwl_is_rfkill(p->shrd)) \
77	dev_err(bus(p)->dev, "%s%c %s " fmt, \	77	dev_err(trans(p)->dev, "%s%c %s " fmt, \
78	"", \	78	"", \
79	in_interrupt() ? 'I' : 'U', __func__, \	79	in_interrupt() ? 'I' : 'U', __func__, \
80	##__VA_ARGS__); \	80	##__VA_ARGS__); \
81	else if (iwl_get_debug_level(p->shrd) & IWL_DL_RADIO) \	81	else if (iwl_get_debug_level(p->shrd) & IWL_DL_RADIO) \
82	dev_err(bus(p)->dev, "%s%c %s " fmt, \	82	dev_err(trans(p)->dev, "%s%c %s " fmt, \
83	"(RFKILL) ", \	83	"(RFKILL) ", \
84	in_interrupt() ? 'I' : 'U', __func__, \	84	in_interrupt() ? 'I' : 'U', __func__, \
85	##__VA_ARGS__); \	85	##__VA_ARGS__); \