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

Commit 8e6c5363 authored by Robert Love's avatar Robert Love
Browse files

libfc, libfcoe, fcoe: Convert debug_logging macros to pr_info 



Convert libfc, libfcoe and fcoe's debug_logging macros
to use pr_info() instead of printk(KERN_INFO, ...). checkpatch.pl
now complains about this, so convert libfcoe to preferred
method.

Signed-off-by: default avatarRobert Love <robert.w.love@intel.com>
Tested-by: default avatarMarcus Dennis <marcusx.e.dennis@intel.com>
parent 6e89ea3f

drivers/scsi/fcoe/fcoe.h

+3 −3
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ do { \ 


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

	FCOE_CHECK_LOGGING(FCOE_LOGGING,				\

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

			   pr_info("fcoe: " fmt, ##args);)



#define FCOE_NETDEV_DBG(netdev, fmt, args...)			\

	FCOE_CHECK_LOGGING(FCOE_NETDEV_LOGGING,			\

			   printk(KERN_INFO "fcoe: %s: " fmt,	\

			   pr_info("fcoe: %s: " fmt,		\

				   netdev->name, ##args);)



/**

drivers/scsi/fcoe/libfcoe.h

+4 −5
Original line number Diff line number Diff line
@@ -17,17 +17,16 @@ do { \ 


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

	LIBFCOE_CHECK_LOGGING(LIBFCOE_LOGGING,				\

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

			      pr_info("libfcoe: " fmt, ##args);)



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

	LIBFCOE_CHECK_LOGGING(LIBFCOE_FIP_LOGGING,			\

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

			      pr_info("host%d: fip: " fmt,		\

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



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

	LIBFCOE_CHECK_LOGGING(LIBFCOE_TRANSPORT_LOGGING,		\

			      printk(KERN_INFO "%s: " fmt,		\

				     __func__, ##args);)

			      pr_info("%s: " fmt, __func__, ##args);)



#define LIBFCOE_SYSFS_DBG(cdev, fmt, args...)				\

	LIBFCOE_CHECK_LOGGING(LIBFCOE_SYSFS_LOGGING,			\

drivers/scsi/libfc/fc_libfc.h

+19 −19
Original line number Diff line number Diff line
@@ -41,23 +41,23 @@ extern unsigned int fc_debug_logging; 


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

	FC_CHECK_LOGGING(FC_LIBFC_LOGGING,				\

			 printk(KERN_INFO "libfc: " fmt, ##args))

			 pr_info("libfc: " fmt, ##args))



#define FC_LPORT_DBG(lport, fmt, args...)				\

	FC_CHECK_LOGGING(FC_LPORT_LOGGING,				\

			 printk(KERN_INFO "host%u: lport %6.6x: " fmt,	\

			 pr_info("host%u: lport %6.6x: " fmt,		\

				 (lport)->host->host_no,		\

				 (lport)->port_id, ##args))



#define FC_DISC_DBG(disc, fmt, args...)					\

	FC_CHECK_LOGGING(FC_DISC_LOGGING,				\

			 printk(KERN_INFO "host%u: disc: " fmt,	\

			 pr_info("host%u: disc: " fmt,			\

				 fc_disc_lport(disc)->host->host_no,	\

				 ##args))



#define FC_RPORT_ID_DBG(lport, port_id, fmt, args...)			\

	FC_CHECK_LOGGING(FC_RPORT_LOGGING,				\

			 printk(KERN_INFO "host%u: rport %6.6x: " fmt,	\

			 pr_info("host%u: rport %6.6x: " fmt,		\

				 (lport)->host->host_no,		\

				 (port_id), ##args))
@@ -70,13 +70,13 @@ extern unsigned int fc_debug_logging; 
		if ((pkt)->seq_ptr) {					\

			struct fc_exch *_ep = NULL;			\

			_ep = fc_seq_exch((pkt)->seq_ptr);		\

			printk(KERN_INFO "host%u: fcp: %6.6x: "		\

			pr_info("host%u: fcp: %6.6x: "			\

				"xid %04x-%04x: " fmt,			\

				(pkt)->lp->host->host_no,		\

				(pkt)->rport->port_id,			\

				(_ep)->oxid, (_ep)->rxid, ##args);	\

		} else {						\

			printk(KERN_INFO "host%u: fcp: %6.6x: " fmt,	\

			pr_info("host%u: fcp: %6.6x: " fmt,		\

				(pkt)->lp->host->host_no,		\

				(pkt)->rport->port_id, ##args);		\

		}							\
@@ -84,13 +84,13 @@ extern unsigned int fc_debug_logging; 


#define FC_EXCH_DBG(exch, fmt, args...)					\

	FC_CHECK_LOGGING(FC_EXCH_LOGGING,				\

			 printk(KERN_INFO "host%u: xid %4x: " fmt,	\

			 pr_info("host%u: xid %4x: " fmt,		\

				 (exch)->lp->host->host_no,		\

				 exch->xid, ##args))



#define FC_SCSI_DBG(lport, fmt, args...)				\

	FC_CHECK_LOGGING(FC_SCSI_LOGGING,				\

			 printk(KERN_INFO "host%u: scsi: " fmt,		\

			 pr_info("host%u: scsi: " fmt,			\

				 (lport)->host->host_no, ##args))



/*