LinuxLists.cc - [PATCH 1/2] wireless: properly use pr

2012-04-24 02:36:45

Subject: [PATCH 1/2] wireless: properly use pr_fmt()

From: "Luis R. Rodriguez" <[email protected]>

pr_fmt() is either defined or we redefine it. Typically
drivers define it prior to including printk.h but this
is done under the assumption that no other subsystem
it uses has already defined pr_fmt(). In such cases
pr_fmt() should be undefined and redefined.

Doing this properly shaves down compilation time quite
considerably.

Signed-off-by: Luis R. Rodriguez <[email protected]>
---

I left out only ath6kl as ath6kl folks get groggy it seems
if you do not go through their tree. Bleh.

drivers/net/wireless/ath/ath5k/ani.c | 3 +++
drivers/net/wireless/ath/ath5k/attach.c | 2 ++
drivers/net/wireless/ath/ath5k/base.c | 2 ++
drivers/net/wireless/ath/ath5k/desc.c | 3 +++
drivers/net/wireless/ath/ath5k/dma.c | 3 +++
drivers/net/wireless/ath/ath5k/eeprom.c | 2 ++
drivers/net/wireless/ath/ath5k/initvals.c | 3 +++
drivers/net/wireless/ath/ath5k/led.c | 2 ++
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 3 +++
drivers/net/wireless/ath/ath5k/pci.c | 2 ++
drivers/net/wireless/ath/ath5k/phy.c | 2 ++
drivers/net/wireless/ath/ath5k/qcu.c | 3 +++
drivers/net/wireless/ath/ath5k/reset.c | 2 ++
drivers/net/wireless/ath/ath5k/sysfs.c | 2 ++
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 3 +++
drivers/net/wireless/ath/ath9k/htc_hst.c | 3 +++
drivers/net/wireless/ath/ath9k/init.c | 2 ++
drivers/net/wireless/ath/ath9k/pci.c | 2 ++
drivers/net/wireless/ath/main.c | 2 ++
drivers/net/wireless/ath/regd.c | 2 ++
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 ++
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 ++
drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 2 ++
drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 ++
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 ++
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1 +
drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 2 ++
drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 ++
drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 2 ++
drivers/net/wireless/brcm80211/brcmsmac/dma.c | 3 ++-
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 2 ++
drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 ++
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 2 ++
drivers/net/wireless/brcm80211/brcmutil/utils.c | 2 ++
drivers/net/wireless/iwlegacy/3945-mac.c | 2 ++
drivers/net/wireless/iwlegacy/4965-mac.c | 2 ++
drivers/net/wireless/iwlwifi/iwl-agn.c | 2 ++
drivers/net/wireless/iwlwifi/iwl-pci.c | 2 ++
drivers/net/wireless/libertas/cfg.c | 2 ++
drivers/net/wireless/libertas/if_cs.c | 2 ++
drivers/net/wireless/libertas/if_sdio.c | 2 ++
drivers/net/wireless/libertas/if_spi.c | 2 ++
drivers/net/wireless/libertas/if_usb.c | 2 ++
drivers/net/wireless/libertas/main.c | 2 ++
drivers/net/wireless/libertas/mesh.c | 2 ++
drivers/net/wireless/libertas/rx.c | 2 ++
drivers/net/wireless/libertas_tf/cmd.c | 2 ++
drivers/net/wireless/libertas_tf/if_usb.c | 2 ++
drivers/net/wireless/libertas_tf/main.c | 2 ++
drivers/net/wireless/rtlwifi/wifi.h | 2 ++
net/wireless/core.c | 2 ++
net/wireless/lib80211.c | 2 ++
net/wireless/lib80211_crypt_tkip.c | 2 ++
net/wireless/reg.c | 2 ++
54 files changed, 115 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath5k/ani.c b/drivers/net/wireless/ath/ath5k/ani.c
index 5c00875..f6a2e0d 100644
--- a/drivers/net/wireless/ath/ath5k/ani.c
+++ b/drivers/net/wireless/ath/ath5k/ani.c
@@ -14,8 +14,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
+
#include "ath5k.h"
#include "reg.h"
#include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c
index 7106547..1fe4f08 100644
--- a/drivers/net/wireless/ath/ath5k/attach.c
+++ b/drivers/net/wireless/ath/ath5k/attach.c
@@ -20,8 +20,10 @@
* Attach/Detach Functions and helpers *
\*************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include "ath5k.h"
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c
index 49e3b19..04a5fc0 100644
--- a/drivers/net/wireless/ath/ath5k/base.c
+++ b/drivers/net/wireless/ath/ath5k/base.c
@@ -40,8 +40,10 @@
*
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h>
diff --git a/drivers/net/wireless/ath/ath5k/desc.c b/drivers/net/wireless/ath/ath5k/desc.c
index bd8d439..7068be2 100644
--- a/drivers/net/wireless/ath/ath5k/desc.c
+++ b/drivers/net/wireless/ath/ath5k/desc.c
@@ -21,8 +21,11 @@
Hardware Descriptor Functions
\******************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
+
#include "ath5k.h"
#include "reg.h"
#include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/dma.c b/drivers/net/wireless/ath/ath5k/dma.c
index ce86f15..c9d42d0 100644
--- a/drivers/net/wireless/ath/ath5k/dma.c
+++ b/drivers/net/wireless/ath/ath5k/dma.c
@@ -29,8 +29,11 @@
* status registers (ISR).
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
+
#include "ath5k.h"
#include "reg.h"
#include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c
index 4026c90..e32524e 100644
--- a/drivers/net/wireless/ath/ath5k/eeprom.c
+++ b/drivers/net/wireless/ath/ath5k/eeprom.c
@@ -21,8 +21,10 @@
* EEPROM access functions and helpers *
\*************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/slab.h>

#include "ath5k.h"
diff --git a/drivers/net/wireless/ath/ath5k/initvals.c b/drivers/net/wireless/ath/ath5k/initvals.c
index ee1c2fa..7fc4016 100644
--- a/drivers/net/wireless/ath/ath5k/initvals.c
+++ b/drivers/net/wireless/ath/ath5k/initvals.c
@@ -19,8 +19,11 @@
*
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
+
#include "ath5k.h"
#include "reg.h"
#include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/led.c b/drivers/net/wireless/ath/ath5k/led.c
index b9f708a..c044476 100644
--- a/drivers/net/wireless/ath/ath5k/led.c
+++ b/drivers/net/wireless/ath/ath5k/led.c
@@ -39,8 +39,10 @@
*
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/pci.h>
#include "ath5k.h"

diff --git a/drivers/net/wireless/ath/ath5k/mac80211-ops.c b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
index 22b80af..6d9a4d1 100644
--- a/drivers/net/wireless/ath/ath5k/mac80211-ops.c
+++ b/drivers/net/wireless/ath/ath5k/mac80211-ops.c
@@ -41,11 +41,14 @@
*
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <net/mac80211.h>
#include <asm/unaligned.h>

+#include <linux/printk.h>
+
#include "ath5k.h"
#include "base.h"
#include "reg.h"
diff --git a/drivers/net/wireless/ath/ath5k/pci.c b/drivers/net/wireless/ath/ath5k/pci.c
index dff48fb..076b33f 100644
--- a/drivers/net/wireless/ath/ath5k/pci.c
+++ b/drivers/net/wireless/ath/ath5k/pci.c
@@ -14,8 +14,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/nl80211.h>
#include <linux/pci.h>
#include <linux/pci-aspm.h>
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c
index 8b71a2d..903ddcc 100644
--- a/drivers/net/wireless/ath/ath5k/phy.c
+++ b/drivers/net/wireless/ath/ath5k/phy.c
@@ -22,8 +22,10 @@
* PHY related functions *
\***********************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/delay.h>
#include <linux/slab.h>
#include <asm/unaligned.h>
diff --git a/drivers/net/wireless/ath/ath5k/qcu.c b/drivers/net/wireless/ath/ath5k/qcu.c
index 65fe929..fbe1add 100644
--- a/drivers/net/wireless/ath/ath5k/qcu.c
+++ b/drivers/net/wireless/ath/ath5k/qcu.c
@@ -20,8 +20,11 @@
Queue Control Unit, DCF Control Unit Functions
\********************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
+
#include "ath5k.h"
#include "reg.h"
#include "debug.h"
diff --git a/drivers/net/wireless/ath/ath5k/reset.c b/drivers/net/wireless/ath/ath5k/reset.c
index 0c2dd47..ca06e35 100644
--- a/drivers/net/wireless/ath/ath5k/reset.c
+++ b/drivers/net/wireless/ath/ath5k/reset.c
@@ -23,10 +23,12 @@
Reset function and helpers
\****************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <asm/unaligned.h>

+#include <linux/printk.h>
#include <linux/pci.h> /* To determine if a card is pci-e */
#include <linux/log2.h>
#include <linux/platform_device.h>
diff --git a/drivers/net/wireless/ath/ath5k/sysfs.c b/drivers/net/wireless/ath/ath5k/sysfs.c
index 04cf0ca..1aec168 100644
--- a/drivers/net/wireless/ath/ath5k/sysfs.c
+++ b/drivers/net/wireless/ath/ath5k/sysfs.c
@@ -1,5 +1,7 @@
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/device.h>
#include <linux/pci.h>

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 25213d5..809c357 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -14,8 +14,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
+
#include "htc.h"

MODULE_AUTHOR("Atheros Communications");
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c
index 4a9570d..caff822 100644
--- a/drivers/net/wireless/ath/ath9k/htc_hst.c
+++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -14,8 +14,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
+
#include "htc.h"

static int htc_issue_send(struct htc_target *target, struct sk_buff* skb,
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index dee9e09..3bbfd4a 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -14,8 +14,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/dma-mapping.h>
#include <linux/slab.h>
#include <linux/ath9k_platform.h>
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c
index a856b51..1c048aa 100644
--- a/drivers/net/wireless/ath/ath9k/pci.c
+++ b/drivers/net/wireless/ath/ath9k/pci.c
@@ -14,8 +14,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/nl80211.h>
#include <linux/pci.h>
#include <linux/pci-aspm.h>
diff --git a/drivers/net/wireless/ath/main.c b/drivers/net/wireless/ath/main.c
index 8e99540..5e04536 100644
--- a/drivers/net/wireless/ath/main.c
+++ b/drivers/net/wireless/ath/main.c
@@ -14,9 +14,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/module.h>

#include "ath.h"
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c
index d816980..c927f20 100644
--- a/drivers/net/wireless/ath/regd.c
+++ b/drivers/net/wireless/ath/regd.c
@@ -14,9 +14,11 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/export.h>
#include <net/cfg80211.h>
#include <net/mac80211.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index e925290..eaa5c92 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -15,8 +15,10 @@
*/
/* ****************** SDIO CARD Interface Functions **************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/types.h>
#include <linux/netdevice.h>
#include <linux/export.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
index 4688904..a963d6c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c
@@ -14,8 +14,10 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/types.h>
#include <linux/netdevice.h>
#include <linux/mmc/sdio.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
index a5c15ca..5530e48 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c
@@ -19,8 +19,10 @@
* For certain dcmd codes, the dongle interprets string data from the host.
******************************************************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/types.h>
#include <linux/netdevice.h>
#include <linux/sched.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
index 236cb9f..2962900 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c
@@ -14,9 +14,11 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/netdevice.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 8933f9b..f6d5d83 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -14,10 +14,12 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/init.h>
#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/kthread.h>
#include <linux/slab.h>
#include <linux/skbuff.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index a83fbea..09d5e6d 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -14,6 +14,7 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/types.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
index 1534efc..0facbf4 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c
@@ -15,8 +15,10 @@
*/
/* ***** SDIO interface chip backplane handle functions ***** */

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/types.h>
#include <linux/netdevice.h>
#include <linux/mmc/card.h>
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index d13ae9c..65e48d7 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -16,9 +16,11 @@

/* Toplevel file. Relies on dhd_linux.c to send commands to the dongle. */

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/if_arp.h>
#include <linux/sched.h>
#include <linux/kthread.h>
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
index c93ea35..671cf5b 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/aiutils.c
@@ -16,8 +16,10 @@
* File contents: support functions for PCI/PCIe
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/delay.h>
#include <linux/pci.h>

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/dma.c b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
index 11054ae..e898266 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/dma.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/dma.c
@@ -13,9 +13,10 @@
* OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/pci.h>
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
index aa15558..1248023 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
@@ -15,8 +15,10 @@
*/

#define __UNDEF_NO_VERSION__
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/etherdevice.h>
#include <linux/sched.h>
#include <linux/firmware.h>
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index b4d9279..7d0f6b6 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -14,8 +14,10 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/pci_ids.h>
#include <linux/if_ether.h>
#include <net/mac80211.h>
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
index 812b6e3..b55b1fa 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c
@@ -14,9 +14,11 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/delay.h>
#include <linux/cordic.h>

diff --git a/drivers/net/wireless/brcm80211/brcmutil/utils.c b/drivers/net/wireless/brcm80211/brcmutil/utils.c
index b45ab34..b327d35 100644
--- a/drivers/net/wireless/brcm80211/brcmutil/utils.c
+++ b/drivers/net/wireless/brcm80211/brcmutil/utils.c
@@ -14,8 +14,10 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/netdevice.h>
#include <linux/module.h>

diff --git a/drivers/net/wireless/iwlegacy/3945-mac.c b/drivers/net/wireless/iwlegacy/3945-mac.c
index faec404..db47836 100644
--- a/drivers/net/wireless/iwlegacy/3945-mac.c
+++ b/drivers/net/wireless/iwlegacy/3945-mac.c
@@ -27,9 +27,11 @@
*
*****************************************************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/pci.h>
diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index f2baf94..1a03a09 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -27,9 +27,11 @@
*
*****************************************************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/pci.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 202043a..c9e1d0e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -27,8 +27,10 @@
*
*****************************************************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c
index 3b41b84..2fb4b3c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-pci.c
+++ b/drivers/net/wireless/iwlwifi/iwl-pci.c
@@ -61,8 +61,10 @@
*
*****************************************************************************/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/pci.h>
#include <linux/pci-aspm.h>
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c
index 2fa879b..08864c1 100644
--- a/drivers/net/wireless/libertas/cfg.c
+++ b/drivers/net/wireless/libertas/cfg.c
@@ -6,8 +6,10 @@
*
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/hardirq.h>
#include <linux/sched.h>
#include <linux/wait.h>
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 16beaf3..aa0bd91 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -21,8 +21,10 @@

*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/delay.h>
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 76caeba..2b45a94 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -26,9 +26,11 @@
* if_sdio_card_to_host() to pad the data.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/firmware.h>
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
index 9604a1c..93dc5445 100644
--- a/drivers/net/wireless/libertas/if_spi.c
+++ b/drivers/net/wireless/libertas/if_spi.c
@@ -17,8 +17,10 @@
* (at your option) any later version.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/hardirq.h>
#include <linux/interrupt.h>
#include <linux/module.h>
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index 75403e6..b9b29da 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -2,8 +2,10 @@
* This file contains functions used in USB interface module.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/firmware.h>
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index e96ee0a..f889f16 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -4,8 +4,10 @@
* thread etc..
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/etherdevice.h>
diff --git a/drivers/net/wireless/libertas/mesh.c b/drivers/net/wireless/libertas/mesh.c
index e87c031..bd807cd 100644
--- a/drivers/net/wireless/libertas/mesh.c
+++ b/drivers/net/wireless/libertas/mesh.c
@@ -1,5 +1,7 @@
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/delay.h>
#include <linux/etherdevice.h>
#include <linux/hardirq.h>
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c
index c7366b0..707ecfc 100644
--- a/drivers/net/wireless/libertas/rx.c
+++ b/drivers/net/wireless/libertas/rx.c
@@ -2,8 +2,10 @@
* This file contains the handling of RX in wlan driver.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/etherdevice.h>
#include <linux/hardirq.h>
#include <linux/slab.h>
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c
index 909ac36..3e35c71 100644
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@ -7,8 +7,10 @@
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*/
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/hardirq.h>
#include <linux/slab.h>
#include <linux/export.h>
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c
index 7ced130..05fa172 100644
--- a/drivers/net/wireless/libertas_tf/if_usb.c
+++ b/drivers/net/wireless/libertas_tf/if_usb.c
@@ -9,11 +9,13 @@
*/
#define DRV_NAME "lbtf_usb"

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include "libertas_tf.h"
#include "if_usb.h"

+#include <linux/printk.h>
#include <linux/delay.h>
#include <linux/module.h>
#include <linux/firmware.h>
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c
index a034572..50c17f0 100644
--- a/drivers/net/wireless/libertas_tf/main.c
+++ b/drivers/net/wireless/libertas_tf/main.c
@@ -7,8 +7,10 @@
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*/
+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/hardirq.h>
#include <linux/slab.h>

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index bd816ae..00881fe 100644
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -30,8 +30,10 @@
#ifndef __RTL_WIFI_H__
#define __RTL_WIFI_H__

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/sched.h>
#include <linux/firmware.h>
#include <linux/etherdevice.h>
diff --git a/net/wireless/core.c b/net/wireless/core.c
index 39f2538..61eb9a4 100644
--- a/net/wireless/core.c
+++ b/net/wireless/core.c
@@ -4,8 +4,10 @@
* Copyright 2006-2010 Johannes Berg <[email protected]>
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/if.h>
#include <linux/module.h>
#include <linux/err.h>
diff --git a/net/wireless/lib80211.c b/net/wireless/lib80211.c
index a55c27b..4b35cd0 100644
--- a/net/wireless/lib80211.c
+++ b/net/wireless/lib80211.c
@@ -13,8 +13,10 @@
*
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/module.h>
#include <linux/ctype.h>
#include <linux/ieee80211.h>
diff --git a/net/wireless/lib80211_crypt_tkip.c b/net/wireless/lib80211_crypt_tkip.c
index 3873484..ff6bf45 100644
--- a/net/wireless/lib80211_crypt_tkip.c
+++ b/net/wireless/lib80211_crypt_tkip.c
@@ -10,8 +10,10 @@
* more details.
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

+#include <linux/printk.h>
#include <linux/err.h>
#include <linux/module.h>
#include <linux/init.h>
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 15f3474..d75026c 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -42,9 +42,11 @@
*
*/

+#undef pr_fmt
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

#include <linux/kernel.h>
+#include <linux/printk.h>
#include <linux/export.h>
#include <linux/slab.h>
#include <linux/list.h>
--
1.7.10.rc1.22.gf5241

2012-04-24 06:41:27

by Luis Chamberlain

[permalink] [raw]

Subject: Re: [PATCH 1/2] wireless: properly use pr_fmt()

On Mon, Apr 23, 2012 at 10:50 PM, Johannes Berg
<[email protected]> wrote:
> On Mon, 2012-04-23 at 19:36 -0700, Luis R. Rodriguez wrote:
>> From: "Luis R. Rodriguez" <[email protected]>
>>
>> pr_fmt() is either defined or we redefine it. Typically
>> drivers define it prior to including printk.h but this
>> is done under the assumption that no other subsystem
>> it uses has already defined pr_fmt(). In such cases
>> pr_fmt() should be undefined and redefined.
>>
>> Doing this properly shaves down compilation time quite
>> considerably.
>
>> --- a/drivers/net/wireless/ath/ath5k/ani.c
>> +++ b/drivers/net/wireless/ath/ath5k/ani.c
>> @@ -14,8 +14,11 @@
>> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
>> */
>>
>> +#undef pr_fmt
>> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
>
> I understand this is right for compat, but is it really also needed in
> mainline?

I've seen drivers do this, drivers/net/wireless/mwifiex/decl.h was
where I got the hint of doing this actually.

> I was under the impression there we never defined pr_fmt in
> header files.

I think this is a good assumption, but it can easily and sloppily hold
to not be true. In fact, I'm thinking it may make sense to add a
helper to do this uniformly across the kernel.

Luis

2012-04-26 12:54:57

by Arend van Spriel

[permalink] [raw]

Subject: Re: [PATCH 1/2] wireless: properly use pr_fmt()

On 04/26/2012 02:44 PM, Arend van Spriel wrote:
> On 04/24/2012 04:36 AM, Luis R. Rodriguez wrote:
>> From: "Luis R. Rodriguez"<[email protected]>
>>
>> pr_fmt() is either defined or we redefine it. Typically
>> drivers define it prior to including printk.h but this
>> is done under the assumption that no other subsystem
>> it uses has already defined pr_fmt(). In such cases
>> pr_fmt() should be undefined and redefined.
>>
>> Doing this properly shaves down compilation time quite
>> considerably.
>>
>> Signed-off-by: Luis R. Rodriguez<[email protected]>
>
> Hi Luis,
>
> I actually recall some patches removing inclusion of printk.h sometime
> ago. Not sure what the motivation was, but I will start digging the git
> revision logs.
>
> Gr. AvS
>

Here it is: https://lkml.org/lkml/2011/5/25/331

Gr. AvS

2012-04-26 11:35:06

by Kalle Valo

[permalink] [raw]

Subject: Re: [PATCH 2/2] ath6kl: properly use pr_fmt()

On 04/24/2012 05:36 AM, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <[email protected]>
>
> pr_fmt() is either defined or we redefine it. Typically
> drivers define it prior to including printk.h but this
> is done under the assumption that no other subsystem
> it uses has already defined pr_fmt(). In such cases
> pr_fmt() should be undefined and redefined.
>
> Doing this properly shaves down compilation time quite
> considerably.
>
> Cc: Kalle Valo <[email protected]>
> Signed-off-by: Luis R. Rodriguez <[email protected]>

I'm dropping this based on the feedback from davem.

Kalle

2012-04-26 12:45:06

by Arend van Spriel

[permalink] [raw]

Subject: Re: [PATCH 1/2] wireless: properly use pr_fmt()

2012-04-25 06:49:49

by Kalle Valo

[permalink] [raw]

Subject: Re: [PATCH 1/2] wireless: properly use pr_fmt()

On 04/24/2012 05:36 AM, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <[email protected]>
>
> pr_fmt() is either defined or we redefine it. Typically
> drivers define it prior to including printk.h but this
> is done under the assumption that no other subsystem
> it uses has already defined pr_fmt(). In such cases
> pr_fmt() should be undefined and redefined.
>
> Doing this properly shaves down compilation time quite
> considerably.
>
> Signed-off-by: Luis R. Rodriguez <[email protected]>
> ---
>
> I left out only ath6kl as ath6kl folks get groggy it seems
> if you do not go through their tree. Bleh.

Yeah, I prefer ath6kl patches going to ath6kl.git first just to avoid
conflicts when merging. But simple patches like this are not an issue,
conflicts are unlikely or are easy to fix.

Kalle

2012-04-24 02:36:48

by Luis R. Rodriguez

[permalink] [raw]

Subject: [PATCH 2/2] ath6kl: properly use pr_fmt()

2012-04-24 05:50:19

by Johannes Berg

[permalink] [raw]

Subject: Re: [PATCH 1/2] wireless: properly use pr_fmt()

On Mon, 2012-04-23 at 19:36 -0700, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <[email protected]>
>
> pr_fmt() is either defined or we redefine it. Typically
> drivers define it prior to including printk.h but this
> is done under the assumption that no other subsystem
> it uses has already defined pr_fmt(). In such cases
> pr_fmt() should be undefined and redefined.
>
> Doing this properly shaves down compilation time quite
> considerably.

> --- a/drivers/net/wireless/ath/ath5k/ani.c
> +++ b/drivers/net/wireless/ath/ath5k/ani.c
> @@ -14,8 +14,11 @@
> * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
> */
>
> +#undef pr_fmt
> #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

I understand this is right for compat, but is it really also needed in
mainline? I was under the impression there we never defined pr_fmt in
header files.

johannes

2012-04-26 14:17:39

by Luis R. Rodriguez

[permalink] [raw]

Subject: Re: [PATCH 1/2] wireless: properly use pr_fmt()

T24gVGh1LCBBcHIgMjYsIDIwMTIgYXQgNjowMyBBTSwgSGF1a2UgTWVocnRlbnMgPGhhdWtlQGhh
dWtlLW0uZGU+IHdyb3RlOgo+IE9uIDA0LzI0LzIwMTIgMDQ6MzYgQU0sIEx1aXMgUi4gUm9kcmln
dWV6IHdyb3RlOgo+PiBGcm9tOiAiTHVpcyBSLiBSb2RyaWd1ZXoiIDxtY2dyb2ZAZnJpam9sZXJv
Lm9yZz4KPj4KPj4gcHJfZm10KCkgaXMgZWl0aGVyIGRlZmluZWQgb3Igd2UgcmVkZWZpbmUgaXQu
IFR5cGljYWxseQo+PiBkcml2ZXJzIGRlZmluZSBpdCBwcmlvciB0byBpbmNsdWRpbmcgcHJpbnRr
LmggYnV0IHRoaXMKPj4gaXMgZG9uZSB1bmRlciB0aGUgYXNzdW1wdGlvbiB0aGF0IG5vIG90aGVy
IHN1YnN5c3RlbQo+PiBpdCB1c2VzIGhhcyBhbHJlYWR5IGRlZmluZWQgcHJfZm10KCkuIEluIHN1
Y2ggY2FzZXMKPj4gcHJfZm10KCkgc2hvdWxkIGJlIHVuZGVmaW5lZCBhbmQgcmVkZWZpbmVkLgo+
Pgo+PiBEb2luZyB0aGlzIHByb3Blcmx5IHNoYXZlcyBkb3duIGNvbXBpbGF0aW9uIHRpbWUgcXVp
dGUKPj4gY29uc2lkZXJhYmx5Lgo+Pgo+PiBTaWduZWQtb2ZmLWJ5OiBMdWlzIFIuIFJvZHJpZ3Vl
eiA8bWNncm9mQGZyaWpvbGVyby5vcmc+Cj4+IC0tLQo+Pgo+PiBJIGxlZnQgb3V0IG9ubHkgYXRo
NmtsIGFzIGF0aDZrbCBmb2xrcyBnZXQgZ3JvZ2d5IGl0IHNlZW1zCj4+IGlmIHlvdSBkbyBub3Qg
Z28gdGhyb3VnaCB0aGVpciB0cmVlLiBCbGVoLgo+Pgo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNz
L2F0aC9hdGg1ay9hbmkuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKgIMKgMyArKysK
Pj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoNWsvYXR0YWNoLmMgwqAgwqAgwqAgwqAg
wqAgwqAgwqAgwqB8IMKgIMKgMiArKwo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg1
ay9iYXNlLmMgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB8IMKgIMKgMiArKwo+PiDCoGRyaXZl
cnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg1ay9kZXNjLmMgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqB8IMKgIMKgMyArKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoNWsvZG1hLmMg
wqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgfCDCoCDCoDMgKysrCj4+IMKgZHJpdmVycy9uZXQv
d2lyZWxlc3MvYXRoL2F0aDVrL2VlcHJvbS5jIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgfCDCoCDC
oDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoNWsvaW5pdHZhbHMuYyDCoCDC
oCDCoCDCoCDCoCDCoCDCoHwgwqAgwqAzICsrKwo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0
aC9hdGg1ay9sZWQuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKgIMKgMiArKwo+PiDC
oGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg1ay9tYWM4MDIxMS1vcHMuYyDCoCDCoCDCoCDC
oCDCoHwgwqAgwqAzICsrKwo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg1ay9wY2ku
YyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKgIMKgMiArKwo+PiDCoGRyaXZlcnMvbmV0
L3dpcmVsZXNzL2F0aC9hdGg1ay9waHkuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKg
IMKgMiArKwo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg1ay9xY3UuYyDCoCDCoCDC
oCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKgIMKgMyArKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVz
cy9hdGgvYXRoNWsvcmVzZXQuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKgIMKgMiArKwo+
PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2F0aC9hdGg1ay9zeXNmcy5jIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvYXRoL2F0aDlr
L2h0Y19kcnZfaW5pdC5jIMKgIMKgIMKgIMKgIMKgfCDCoCDCoDMgKysrCj4+IMKgZHJpdmVycy9u
ZXQvd2lyZWxlc3MvYXRoL2F0aDlrL2h0Y19oc3QuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKg
IMKgMyArKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvYXRoOWsvaW5pdC5jIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgfCDCoCDCoDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVz
cy9hdGgvYXRoOWsvcGNpLmMgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgfCDCoCDCoDIgKysK
Pj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgvbWFpbi5jIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgfCDCoCDCoDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9hdGgv
cmVnZC5jIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgfCDCoCDCoDIgKysKPj4g
wqBkcml2ZXJzL25ldC93aXJlbGVzcy9icmNtODAyMTEvYnJjbWZtYWMvYmNtc2RoLmMgwqAgwqAg
wqAgfCDCoCDCoDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9icmNtODAyMTEvYnJjbWZt
YWMvYmNtc2RoX3NkbW1jLmMgfCDCoCDCoDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9i
cmNtODAyMTEvYnJjbWZtYWMvZGhkX2NkYy5jIMKgIMKgIMKgfCDCoCDCoDIgKysKPj4gwqBkcml2
ZXJzL25ldC93aXJlbGVzcy9icmNtODAyMTEvYnJjbWZtYWMvZGhkX2NvbW1vbi5jIMKgIHwgwqAg
wqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvYnJjbTgwMjExL2JyY21mbWFjL2RoZF9s
aW51eC5jIMKgIMKgfCDCoCDCoDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9icmNtODAy
MTEvYnJjbWZtYWMvZGhkX3NkaW8uYyDCoCDCoCB8IMKgIMKgMSArCj4+IMKgZHJpdmVycy9uZXQv
d2lyZWxlc3MvYnJjbTgwMjExL2JyY21mbWFjL3NkaW9fY2hpcC5jIMKgIMKgfCDCoCDCoDIgKysK
Pj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9icmNtODAyMTEvYnJjbWZtYWMvd2xfY2ZnODAyMTEu
YyDCoHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvYnJjbTgwMjExL2JyY21z
bWFjL2FpdXRpbHMuYyDCoCDCoCDCoHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxl
c3MvYnJjbTgwMjExL2JyY21zbWFjL2RtYS5jIMKgIMKgIMKgIMKgIMKgfCDCoCDCoDMgKystCj4+
IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvYnJjbTgwMjExL2JyY21zbWFjL21hYzgwMjExX2lmLmMg
wqB8IMKgIMKgMiArKwo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2JyY204MDIxMS9icmNtc21h
Yy9tYWluLmMgwqAgwqAgwqAgwqAgfCDCoCDCoDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVz
cy9icmNtODAyMTEvYnJjbXNtYWMvcGh5L3BoeV9uLmMgwqAgwqB8IMKgIMKgMiArKwo+PiDCoGRy
aXZlcnMvbmV0L3dpcmVsZXNzL2JyY204MDIxMS9icmNtdXRpbC91dGlscy5jIMKgIMKgIMKgIMKg
fCDCoCDCoDIgKysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2xlZ2FjeS8zOTQ1LW1hYy5j
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxl
c3MvaXdsZWdhY3kvNDk2NS1tYWMuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKgIMKgMiArKwo+
PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLWFnbi5jIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9p
d2wtcGNpLmMgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgfCDCoCDCoDIgKysKPj4gwqBkcml2ZXJz
L25ldC93aXJlbGVzcy9saWJlcnRhcy9jZmcuYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDC
oHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvbGliZXJ0YXMvaWZfY3MuYyDC
oCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2ly
ZWxlc3MvbGliZXJ0YXMvaWZfc2Rpby5jIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgfCDCoCDCoDIg
KysKPj4gwqBkcml2ZXJzL25ldC93aXJlbGVzcy9saWJlcnRhcy9pZl9zcGkuYyDCoCDCoCDCoCDC
oCDCoCDCoCDCoCDCoCB8IMKgIMKgMiArKwo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2xpYmVy
dGFzL2lmX3VzYi5jIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHwgwqAgwqAyICsrCj4+IMKgZHJp
dmVycy9uZXQvd2lyZWxlc3MvbGliZXJ0YXMvbWFpbi5jIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvbGliZXJ0YXMvbWVzaC5j
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQv
d2lyZWxlc3MvbGliZXJ0YXMvcnguYyDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCDCoCB8IMKg
IMKgMiArKwo+PiDCoGRyaXZlcnMvbmV0L3dpcmVsZXNzL2xpYmVydGFzX3RmL2NtZC5jIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3Mv
bGliZXJ0YXNfdGYvaWZfdXNiLmMgwqAgwqAgwqAgwqAgwqAgwqAgwqB8IMKgIMKgMiArKwo+PiDC
oGRyaXZlcnMvbmV0L3dpcmVsZXNzL2xpYmVydGFzX3RmL21haW4uYyDCoCDCoCDCoCDCoCDCoCDC
oCDCoCDCoHwgwqAgwqAyICsrCj4+IMKgZHJpdmVycy9uZXQvd2lyZWxlc3MvcnRsd2lmaS93aWZp
LmggwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqB8IMKgIMKgMiArKwo+PiDCoG5ldC93aXJl
bGVzcy9jb3JlLmMgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAgwqAg
wqAgwqAgwqB8IMKgIMKgMiArKwo+PiDCoG5ldC93aXJlbGVzcy9saWI4MDIxMS5jIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgfCDCoCDCoDIgKysKPj4gwqBu
ZXQvd2lyZWxlc3MvbGliODAyMTFfY3J5cHRfdGtpcC5jIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIHwgwqAgwqAyICsrCj4+IMKgbmV0L3dpcmVsZXNzL3JlZy5jIMKgIMKgIMKgIMKgIMKg
IMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIMKgIHwgwqAgwqAyICsrCj4+IMKg
NTQgZmlsZXMgY2hhbmdlZCwgMTE1IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKPj4KPgo+
IEhpIEx1aXMsCj4KPiB0aGUgcHJvYmxlbSBoZXJlIGlzIHRoYXQgY29tcGF0LXdpcmVsZXNzIGds
b2JhbGx5IGluY2x1ZGVzIGxvdHMgb2YKPiBoZWFkZXIgZmlsZXMgZnJvbSB0aGUga2VybmVsIGFu
ZCB0aGF0IGFsc28gaW5jbHVkZXMgcHJpbnRrLmguIEkgbWFkZSBhCj4gcGF0Y2ggc29tZSB0aW1l
IGFnbyB0byByZXN0cnVjdHVyZSBjb21wYXQgc28gdGhhdCB3ZSBkbyBub3QgaGF2ZSB0bwo+IGlu
Y2x1ZGUgYWxsIHRoZXNlIGhlYWRlcnMgZmlsZXMgZ2xvYmFsbHkuIEkgd2lsbCB3b3JrIG9uIHRo
YXQgYWdhaW4gYW5kCj4gd2lsbCB0cnkgdG8gc2VuZCDCoGEgUkZDIHBhdGNoZXMgc29tZXRpbWUg
dG9kYXkuIFRoaXMgYWxzbyBmaXhlZCB0aGUKPiBwcl9mbXQoKSBwcm9ibGVtIHdpdGhvdXQgdGhl
IG5lZWQgb2YgYW55IHBhdGNoZXMgaW4KPiBjb21wYXQtd2lyZWxlc3MvcGF0Y2hlcyBhbmQgbWFk
ZSBpdCBwb3NzaWJsZSB0byByZW1vdmUgc29tZSBvdGhlcgo+IHBhdGNoZXMgYXMgd2VsbC4KPgo+
IE15IHBsYW4gd2FzIHRvIHBsYWNlIHRoZSBjb21wYXQgaGVhZGVyIGNvZGUgd2hpY2ggaXMgbm93
IGluCj4gY29tcGF0L2luY2x1ZGUvbGludXgvY29tcGF0LSouaCBpbnRvIHRoZSBoZWFkZXJzIHdo
ZXJlIGl0IGlzIGluIHRoZQo+IG1haW5saW5lIGtlcm5lbCBhbmQgaW5jbHVkZSB0aGUgb3JpZ2lu
YWwgZmlsZSB3aXRoIGlubGN1ZGVfbmV4dC4KCkdyZWF0IHRoYW5rcyBIYXVrZSEKCiAgTHVpcwo=

2012-04-26 13:03:23

by Hauke Mehrtens

[permalink] [raw]

Subject: Re: [PATCH 1/2] wireless: properly use pr_fmt()

On 04/24/2012 04:36 AM, Luis R. Rodriguez wrote:
> From: "Luis R. Rodriguez" <[email protected]>
>
> pr_fmt() is either defined or we redefine it. Typically
> drivers define it prior to including printk.h but this
> is done under the assumption that no other subsystem
> it uses has already defined pr_fmt(). In such cases
> pr_fmt() should be undefined and redefined.
>
> Doing this properly shaves down compilation time quite
> considerably.
>
> Signed-off-by: Luis R. Rodriguez <[email protected]>
> ---
>
> I left out only ath6kl as ath6kl folks get groggy it seems
> if you do not go through their tree. Bleh.
>
> drivers/net/wireless/ath/ath5k/ani.c | 3 +++
> drivers/net/wireless/ath/ath5k/attach.c | 2 ++
> drivers/net/wireless/ath/ath5k/base.c | 2 ++
> drivers/net/wireless/ath/ath5k/desc.c | 3 +++
> drivers/net/wireless/ath/ath5k/dma.c | 3 +++
> drivers/net/wireless/ath/ath5k/eeprom.c | 2 ++
> drivers/net/wireless/ath/ath5k/initvals.c | 3 +++
> drivers/net/wireless/ath/ath5k/led.c | 2 ++
> drivers/net/wireless/ath/ath5k/mac80211-ops.c | 3 +++
> drivers/net/wireless/ath/ath5k/pci.c | 2 ++
> drivers/net/wireless/ath/ath5k/phy.c | 2 ++
> drivers/net/wireless/ath/ath5k/qcu.c | 3 +++
> drivers/net/wireless/ath/ath5k/reset.c | 2 ++
> drivers/net/wireless/ath/ath5k/sysfs.c | 2 ++
> drivers/net/wireless/ath/ath9k/htc_drv_init.c | 3 +++
> drivers/net/wireless/ath/ath9k/htc_hst.c | 3 +++
> drivers/net/wireless/ath/ath9k/init.c | 2 ++
> drivers/net/wireless/ath/ath9k/pci.c | 2 ++
> drivers/net/wireless/ath/main.c | 2 ++
> drivers/net/wireless/ath/regd.c | 2 ++
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 2 ++
> drivers/net/wireless/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 ++
> drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 2 ++
> drivers/net/wireless/brcm80211/brcmfmac/dhd_common.c | 2 ++
> drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 ++
> drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 1 +
> drivers/net/wireless/brcm80211/brcmfmac/sdio_chip.c | 2 ++
> drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 2 ++
> drivers/net/wireless/brcm80211/brcmsmac/aiutils.c | 2 ++
> drivers/net/wireless/brcm80211/brcmsmac/dma.c | 3 ++-
> drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c | 2 ++
> drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 ++
> drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c | 2 ++
> drivers/net/wireless/brcm80211/brcmutil/utils.c | 2 ++
> drivers/net/wireless/iwlegacy/3945-mac.c | 2 ++
> drivers/net/wireless/iwlegacy/4965-mac.c | 2 ++
> drivers/net/wireless/iwlwifi/iwl-agn.c | 2 ++
> drivers/net/wireless/iwlwifi/iwl-pci.c | 2 ++
> drivers/net/wireless/libertas/cfg.c | 2 ++
> drivers/net/wireless/libertas/if_cs.c | 2 ++
> drivers/net/wireless/libertas/if_sdio.c | 2 ++
> drivers/net/wireless/libertas/if_spi.c | 2 ++
> drivers/net/wireless/libertas/if_usb.c | 2 ++
> drivers/net/wireless/libertas/main.c | 2 ++
> drivers/net/wireless/libertas/mesh.c | 2 ++
> drivers/net/wireless/libertas/rx.c | 2 ++
> drivers/net/wireless/libertas_tf/cmd.c | 2 ++
> drivers/net/wireless/libertas_tf/if_usb.c | 2 ++
> drivers/net/wireless/libertas_tf/main.c | 2 ++
> drivers/net/wireless/rtlwifi/wifi.h | 2 ++
> net/wireless/core.c | 2 ++
> net/wireless/lib80211.c | 2 ++
> net/wireless/lib80211_crypt_tkip.c | 2 ++
> net/wireless/reg.c | 2 ++
> 54 files changed, 115 insertions(+), 1 deletion(-)
>

Hi Luis,

the problem here is that compat-wireless globally includes lots of
header files from the kernel and that also includes printk.h. I made a
patch some time ago to restructure compat so that we do not have to
include all these headers files globally. I will work on that again and
will try to send a RFC patches sometime today. This also fixed the
pr_fmt() problem without the need of any patches in
compat-wireless/patches and made it possible to remove some other
patches as well.

My plan was to place the compat header code which is now in
compat/include/linux/compat-*.h into the headers where it is in the
mainline kernel and include the original file with inlcude_next.

Hauke