summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-01-08 15:07:59 -0600
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-01-08 15:07:59 -0600
commit286628af775d21cd56e02d66e7e103d66fc17119 (patch)
treebac40ef113d50af4ce5c5137f6e4a84bee09d8b1
parent91cd77f476dd5f0a8806acbf73fc81149e41dcca (diff)
compat-drivers: fix collateral-evolutions/network/53-pr_fmt.patch
The brcmfmac driver was updated recently to only define pr_fmt() once and it also had the undef for us. Technically Joe should not have had to add the undef as I previously went on a crusade to verify that this was not needed at the driver level so an upstream patch is welcomed to remove that undef upstream and then to add it for backporting purposes. commit 79d7c4e8da4ac3cfa98e8e622a17baaeb3c9d29d Author: Arend van Spriel <arend@broadcom.com> Date: Wed Jan 2 21:20:10 2013 +0100 brcmfmac: define pr_fmt in one place Several source files (but not all) define the pr_fmt() macro in exactly the same way. Instead this commit defines it in a header file so driver logging is consistent. Cc: Joe Perches <joe@perches.com> Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
-rw-r--r--patches/collateral-evolutions/network/53-pr_fmt.patch105
1 files changed, 0 insertions, 105 deletions
diff --git a/patches/collateral-evolutions/network/53-pr_fmt.patch b/patches/collateral-evolutions/network/53-pr_fmt.patch
index 9dc8d644..80f253ce 100644
--- a/patches/collateral-evolutions/network/53-pr_fmt.patch
+++ b/patches/collateral-evolutions/network/53-pr_fmt.patch
@@ -255,111 +255,6 @@ compiler warnings. This is going to be sent upstream.
#include <linux/netdevice.h>
#include <linux/module.h>
---- 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>
---- 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>
-
---- 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>
---- 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/kernel.h>
- #include <linux/etherdevice.h>
-+#include <linux/printk.h>
- #include <linux/module.h>
- #include <net/cfg80211.h>
- #include <net/rtnetlink.h>
---- 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/netdevice.h>
- #include <brcmu_wifi.h>
---- 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>
---- 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/etherdevice.h>
- #include <net/cfg80211.h>
- #include <net/netlink.h>
---- 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>
--- a/net/bluetooth/lib.c
+++ b/net/bluetooth/lib.c
@@ -24,9 +24,11 @@