Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iwlwifi: don't include iwl-dev.h from iwl-devtrace.h

iwl-devtrace.h is used to declare and define trace points and
including iwl-dev.h from the file, which in turn includes other
generic headers, can lead to problems like generating duplicate copies
of generic trace points depending on the order of includes. Don't
include iwl-dev.h from iwl-devtrace.h but include it from its users -
iwl-io.h and iwl-devtrace.c.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Reinette Chatre <reinette.chatre@intel.com>
Cc: Zhu Yi <yi.zhu@intel.com>
Cc: Intel Linux Wireless <ilw@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>

Tejun Heo ed391f4e 57f4c226

+3 -1
+2
drivers/net/wireless/iwlwifi/iwl-devtrace.c
··· 28 28 29 29 /* sparse doesn't like tracepoint macros */ 30 30 #ifndef __CHECKER__ 31 + #include "iwl-dev.h" 32 + 31 33 #define CREATE_TRACE_POINTS 32 34 #include "iwl-devtrace.h" 33 35
-1
drivers/net/wireless/iwlwifi/iwl-devtrace.h
··· 28 28 #define __IWLWIFI_DEVICE_TRACE 29 29 30 30 #include <linux/tracepoint.h> 31 - #include "iwl-dev.h" 32 31 33 32 #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__) 34 33 #undef TRACE_EVENT
+1
drivers/net/wireless/iwlwifi/iwl-io.h
··· 31 31 32 32 #include <linux/io.h> 33 33 34 + #include "iwl-dev.h" 34 35 #include "iwl-debug.h" 35 36 #include "iwl-devtrace.h" 36 37