habanalabs: Cancel pr_fmt() definition dependency on includes order (e00dac3d) · Commits · 戴 / test

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. Signed-off-by:

Tomer Tayar <ttayar@habana.ai> Signed-off-by:

Oded Gabbay <oded.gabbay@gmail.com>

drivers/misc/habanalabs/device.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -6,6 +6,8 @@
		*
		*/

		#define pr_fmt(fmt) "habanalabs: " fmt

		#include "habanalabs.h"

		#include <linux/pci.h>

Admin message