Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21b7b2f5 authored by Yi Zou's avatar Yi Zou Committed by James Bottomley
Browse files

[SCSI] libfcoe: move logging macros into the local libfcoe.h header file 



libfcoe kernel module debug macros will used by the fcoe transport code
as well when later it gets added.

Signed-off-by: default avatarYi Zou <yi.zou@intel.com>
Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 6c8cc1c0

drivers/scsi/fcoe/libfcoe.c

+2 −20
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#include <scsi/libfc.h>

#include <scsi/libfcoe.h>



#include "libfcoe.h"



MODULE_AUTHOR("Open-FCoE.org");

MODULE_DESCRIPTION("FIP discovery protocol support for FCoE HBAs");

MODULE_LICENSE("GPL v2");
@@ -70,26 +72,6 @@ unsigned int libfcoe_debug_logging; 
module_param_named(debug_logging, libfcoe_debug_logging, int, S_IRUGO|S_IWUSR);

MODULE_PARM_DESC(debug_logging, "a bit mask of logging levels");



#define LIBFCOE_LOGGING	    0x01 /* General logging, not categorized */

#define LIBFCOE_FIP_LOGGING 0x02 /* FIP logging */



#define LIBFCOE_CHECK_LOGGING(LEVEL, CMD)		\

do {							\

	if (unlikely(libfcoe_debug_logging & LEVEL))	\

		do {					\

			CMD;				\

		} while (0);				\

} while (0)



#define LIBFCOE_DBG(fmt, args...)					\

	LIBFCOE_CHECK_LOGGING(LIBFCOE_LOGGING,				\

			      printk(KERN_INFO "libfcoe: " fmt, ##args);)



#define LIBFCOE_FIP_DBG(fip, fmt, args...)				\

	LIBFCOE_CHECK_LOGGING(LIBFCOE_FIP_LOGGING,			\

			      printk(KERN_INFO "host%d: fip: " fmt, 	\

				     (fip)->lp->host->host_no, ##args);)



static const char *fcoe_ctlr_states[] = {

	[FIP_ST_DISABLED] =	"DISABLED",

	[FIP_ST_LINK_WAIT] =	"LINK_WAIT",

drivers/scsi/fcoe/libfcoe.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
#ifndef _FCOE_LIBFCOE_H_

#define _FCOE_LIBFCOE_H_



extern unsigned int libfcoe_debug_logging;

#define LIBFCOE_LOGGING	    0x01 /* General logging, not categorized */

#define LIBFCOE_FIP_LOGGING 0x02 /* FIP logging */



#define LIBFCOE_CHECK_LOGGING(LEVEL, CMD)		\

do {							\

	if (unlikely(libfcoe_debug_logging & LEVEL))	\

		do {					\

			CMD;				\

		} while (0);				\

} while (0)



#define LIBFCOE_DBG(fmt, args...)					\

	LIBFCOE_CHECK_LOGGING(LIBFCOE_LOGGING,				\

			      printk(KERN_INFO "libfcoe: " fmt, ##args);)



#define LIBFCOE_FIP_DBG(fip, fmt, args...)				\

	LIBFCOE_CHECK_LOGGING(LIBFCOE_FIP_LOGGING,			\

			      printk(KERN_INFO "host%d: fip: " fmt,	\

				     (fip)->lp->host->host_no, ##args);)



#endif /* _FCOE_LIBFCOE_H_ */