Skip to contentSkip to conversation

habanalabs: Cancel pr_fmt() definition dependency on includes order

PATCH New Oded Gabbay 1 participant 1 message Apr 20, 2019 Char and misc drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 habanalabs: Cancel pr_fmt() definition dependency on includes order

From: Tomer Tayar <[email protected]>

pr_fmt() should be defined before including linux/printk.h, either directly or indirectly, in order to avoid redefinition of the macro. Currently the macro definition is in habanalabs.h, which is included in many files, and that makes the addition/reorder of includes to be prone to compilation errors.
This patch cancels this dependency by defining the macro only in the few source files that use it.

---
 drivers/misc/habanalabs/device.c         | 2 ++
 drivers/misc/habanalabs/habanalabs.h     | 2 --
 drivers/misc/habanalabs/habanalabs_drv.c | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
drivers/misc/habanalabs/device.c +2 -0
index 25bfb093ff26..a88f7be23c7f 100644
@@ -5,6 +5,8 @@
  * All Rights Reserved.
  */
 
+#define pr_fmt(fmt)			"habanalabs: " fmt
+
 #include "habanalabs.h"
 
 #include <linux/pci.h>
drivers/misc/habanalabs/habanalabs.h +0 -2
index 2f02bb55f66a..86bd5298efd6 100644
@@ -11,8 +11,6 @@
 #include "include/armcp_if.h"
 #include "include/qman_if.h"
 
-#define pr_fmt(fmt)			"habanalabs: " fmt
-
 #include <linux/cdev.h>
 #include <linux/iopoll.h>
 #include <linux/irqreturn.h>
drivers/misc/habanalabs/habanalabs_drv.c +2 -0
index 1667df7ca64c..5f4d155be767 100644
@@ -6,6 +6,8 @@
  *
  */
 
+#define pr_fmt(fmt)		"habanalabs: " fmt
+
 #include "habanalabs.h"
 
 #include <linux/pci.h>
Signature · 1 line
2.17.1