Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-28 13:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

libfc, libfcoe, fcoe: Convert debug_logging macros to pr_info

Browse Source 
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: Robert Love <robert.w.love@intel.com>
Tested-by: Marcus Dennis <marcusx.e.dennis@intel.com>
This commit is contained in:
Robert Love 2012-12-04 02:14:53 +00:00
parent 6e89ea3f10
commit 8e6c5363dc
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/scsi/fcoe/fcoe.h
View File

@ -55,12 +55,12 @@ do { \
#define FCOE_DBG(fmt, args...) \ #define FCOE_DBG(fmt, args...) \
FCOE_CHECK_LOGGING(FCOE_LOGGING, \ FCOE_CHECK_LOGGING(FCOE_LOGGING, \
printk(KERN_INFO "fcoe: " fmt, ##args);) pr_info("fcoe: " fmt, ##args);)
#define FCOE_NETDEV_DBG(netdev, fmt, args...) \ #define FCOE_NETDEV_DBG(netdev, fmt, args...) \
FCOE_CHECK_LOGGING(FCOE_NETDEV_LOGGING, \ FCOE_CHECK_LOGGING(FCOE_NETDEV_LOGGING, \
printk(KERN_INFO "fcoe: %s: " fmt, \ pr_info("fcoe: %s: " fmt, \
netdev->name, ##args);) netdev->name, ##args);)
/** /**
* struct fcoe_interface - A FCoE interface * struct fcoe_interface - A FCoE interface

9
drivers/scsi/fcoe/libfcoe.h
View File

@ -17,17 +17,16 @@ do { \
#define LIBFCOE_DBG(fmt, args...) \ #define LIBFCOE_DBG(fmt, args...) \
LIBFCOE_CHECK_LOGGING(LIBFCOE_LOGGING, \ LIBFCOE_CHECK_LOGGING(LIBFCOE_LOGGING, \
printk(KERN_INFO "libfcoe: " fmt, ##args);) pr_info("libfcoe: " fmt, ##args);)
#define LIBFCOE_FIP_DBG(fip, fmt, args...) \ #define LIBFCOE_FIP_DBG(fip, fmt, args...) \
LIBFCOE_CHECK_LOGGING(LIBFCOE_FIP_LOGGING, \ 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);) (fip)->lp->host->host_no, ##args);)
#define LIBFCOE_TRANSPORT_DBG(fmt, args...) \ #define LIBFCOE_TRANSPORT_DBG(fmt, args...) \
LIBFCOE_CHECK_LOGGING(LIBFCOE_TRANSPORT_LOGGING, \ LIBFCOE_CHECK_LOGGING(LIBFCOE_TRANSPORT_LOGGING, \
printk(KERN_INFO "%s: " fmt, \ pr_info("%s: " fmt, __func__, ##args);)
__func__, ##args);)
#define LIBFCOE_SYSFS_DBG(cdev, fmt, args...) \ #define LIBFCOE_SYSFS_DBG(cdev, fmt, args...) \
LIBFCOE_CHECK_LOGGING(LIBFCOE_SYSFS_LOGGING, \ LIBFCOE_CHECK_LOGGING(LIBFCOE_SYSFS_LOGGING, \

38
drivers/scsi/libfc/fc_libfc.h
View File

@ -41,25 +41,25 @@ extern unsigned int fc_debug_logging;
#define FC_LIBFC_DBG(fmt, args...) \ #define FC_LIBFC_DBG(fmt, args...) \
FC_CHECK_LOGGING(FC_LIBFC_LOGGING, \ FC_CHECK_LOGGING(FC_LIBFC_LOGGING, \
printk(KERN_INFO "libfc: " fmt, ##args)) pr_info("libfc: " fmt, ##args))
#define FC_LPORT_DBG(lport, fmt, args...) \ #define FC_LPORT_DBG(lport, fmt, args...) \
FC_CHECK_LOGGING(FC_LPORT_LOGGING, \ 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)->host->host_no, \
(lport)->port_id, ##args)) (lport)->port_id, ##args))
#define FC_DISC_DBG(disc, fmt, args...) \ #define FC_DISC_DBG(disc, fmt, args...) \
FC_CHECK_LOGGING(FC_DISC_LOGGING, \ 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, \ fc_disc_lport(disc)->host->host_no, \
##args)) ##args))
#define FC_RPORT_ID_DBG(lport, port_id, fmt, args...) \ #define FC_RPORT_ID_DBG(lport, port_id, fmt, args...) \
FC_CHECK_LOGGING(FC_RPORT_LOGGING, \ 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, \ (lport)->host->host_no, \
(port_id), ##args)) (port_id), ##args))
#define FC_RPORT_DBG(rdata, fmt, args...) \ #define FC_RPORT_DBG(rdata, fmt, args...) \
FC_RPORT_ID_DBG((rdata)->local_port, (rdata)->ids.port_id, fmt, ##args) FC_RPORT_ID_DBG((rdata)->local_port, (rdata)->ids.port_id, fmt, ##args)
@ -70,13 +70,13 @@ extern unsigned int fc_debug_logging;
if ((pkt)->seq_ptr) { \ if ((pkt)->seq_ptr) { \
struct fc_exch *_ep = NULL; \ struct fc_exch *_ep = NULL; \
_ep = fc_seq_exch((pkt)->seq_ptr); \ _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, \ "xid %04x-%04x: " fmt, \
(pkt)->lp->host->host_no, \ (pkt)->lp->host->host_no, \
(pkt)->rport->port_id, \ (pkt)->rport->port_id, \
(_ep)->oxid, (_ep)->rxid, ##args); \ (_ep)->oxid, (_ep)->rxid, ##args); \
} else { \ } else { \
printk(KERN_INFO "host%u: fcp: %6.6x: " fmt, \ pr_info("host%u: fcp: %6.6x: " fmt, \
(pkt)->lp->host->host_no, \ (pkt)->lp->host->host_no, \
(pkt)->rport->port_id, ##args); \ (pkt)->rport->port_id, ##args); \
} \ } \
@ -84,14 +84,14 @@ extern unsigned int fc_debug_logging;
#define FC_EXCH_DBG(exch, fmt, args...) \ #define FC_EXCH_DBG(exch, fmt, args...) \
FC_CHECK_LOGGING(FC_EXCH_LOGGING, \ 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)->lp->host->host_no, \
exch->xid, ##args)) exch->xid, ##args))
#define FC_SCSI_DBG(lport, fmt, args...) \ #define FC_SCSI_DBG(lport, fmt, args...) \
FC_CHECK_LOGGING(FC_SCSI_LOGGING, \ FC_CHECK_LOGGING(FC_SCSI_LOGGING, \
printk(KERN_INFO "host%u: scsi: " fmt, \ pr_info("host%u: scsi: " fmt, \
(lport)->host->host_no, ##args)) (lport)->host->host_no, ##args))
/* /*
* FC-4 Providers. * FC-4 Providers.