diff options
author | Robert Love <robert.w.love@intel.com> | 2012-12-03 21:14:53 -0500 |
---|---|---|
committer | Robert Love <robert.w.love@intel.com> | 2012-12-14 13:38:55 -0500 |
commit | 8e6c5363dc52afbc60011c2c079bf4c4d26b1272 (patch) | |
tree | fa444a2ead4b5cb9f6a369cdf6c5ca3e09e6504d /drivers/scsi/libfc | |
parent | 6e89ea3f1032d5c762f1ae9b0bd2039794596813 (diff) |
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: Robert Love <robert.w.love@intel.com>
Tested-by: Marcus Dennis <marcusx.e.dennis@intel.com>
Diffstat (limited to 'drivers/scsi/libfc')
-rw-r--r-- | drivers/scsi/libfc/fc_libfc.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/scsi/libfc/fc_libfc.h b/drivers/scsi/libfc/fc_libfc.h index c2830cc66d6a..b74189d89322 100644 --- a/drivers/scsi/libfc/fc_libfc.h +++ b/drivers/scsi/libfc/fc_libfc.h | |||
@@ -41,25 +41,25 @@ extern unsigned int fc_debug_logging; | |||
41 | 41 | ||
42 | #define FC_LIBFC_DBG(fmt, args...) \ | 42 | #define FC_LIBFC_DBG(fmt, args...) \ |
43 | FC_CHECK_LOGGING(FC_LIBFC_LOGGING, \ | 43 | FC_CHECK_LOGGING(FC_LIBFC_LOGGING, \ |
44 | printk(KERN_INFO "libfc: " fmt, ##args)) | 44 | pr_info("libfc: " fmt, ##args)) |
45 | 45 | ||
46 | #define FC_LPORT_DBG(lport, fmt, args...) \ | 46 | #define FC_LPORT_DBG(lport, fmt, args...) \ |
47 | FC_CHECK_LOGGING(FC_LPORT_LOGGING, \ | 47 | FC_CHECK_LOGGING(FC_LPORT_LOGGING, \ |
48 | printk(KERN_INFO "host%u: lport %6.6x: " fmt, \ | 48 | pr_info("host%u: lport %6.6x: " fmt, \ |
49 | (lport)->host->host_no, \ | 49 | (lport)->host->host_no, \ |
50 | (lport)->port_id, ##args)) | 50 | (lport)->port_id, ##args)) |
51 | 51 | ||
52 | #define FC_DISC_DBG(disc, fmt, args...) \ | 52 | #define FC_DISC_DBG(disc, fmt, args...) \ |
53 | FC_CHECK_LOGGING(FC_DISC_LOGGING, \ | 53 | FC_CHECK_LOGGING(FC_DISC_LOGGING, \ |
54 | printk(KERN_INFO "host%u: disc: " fmt, \ | 54 | pr_info("host%u: disc: " fmt, \ |
55 | fc_disc_lport(disc)->host->host_no, \ | 55 | fc_disc_lport(disc)->host->host_no, \ |
56 | ##args)) | 56 | ##args)) |
57 | 57 | ||
58 | #define FC_RPORT_ID_DBG(lport, port_id, fmt, args...) \ | 58 | #define FC_RPORT_ID_DBG(lport, port_id, fmt, args...) \ |
59 | FC_CHECK_LOGGING(FC_RPORT_LOGGING, \ | 59 | FC_CHECK_LOGGING(FC_RPORT_LOGGING, \ |
60 | printk(KERN_INFO "host%u: rport %6.6x: " fmt, \ | 60 | pr_info("host%u: rport %6.6x: " fmt, \ |
61 | (lport)->host->host_no, \ | 61 | (lport)->host->host_no, \ |
62 | (port_id), ##args)) | 62 | (port_id), ##args)) |
63 | 63 | ||
64 | #define FC_RPORT_DBG(rdata, fmt, args...) \ | 64 | #define FC_RPORT_DBG(rdata, fmt, args...) \ |
65 | FC_RPORT_ID_DBG((rdata)->local_port, (rdata)->ids.port_id, fmt, ##args) | 65 | FC_RPORT_ID_DBG((rdata)->local_port, (rdata)->ids.port_id, fmt, ##args) |
@@ -70,13 +70,13 @@ extern unsigned int fc_debug_logging; | |||
70 | if ((pkt)->seq_ptr) { \ | 70 | if ((pkt)->seq_ptr) { \ |
71 | struct fc_exch *_ep = NULL; \ | 71 | struct fc_exch *_ep = NULL; \ |
72 | _ep = fc_seq_exch((pkt)->seq_ptr); \ | 72 | _ep = fc_seq_exch((pkt)->seq_ptr); \ |
73 | printk(KERN_INFO "host%u: fcp: %6.6x: " \ | 73 | pr_info("host%u: fcp: %6.6x: " \ |
74 | "xid %04x-%04x: " fmt, \ | 74 | "xid %04x-%04x: " fmt, \ |
75 | (pkt)->lp->host->host_no, \ | 75 | (pkt)->lp->host->host_no, \ |
76 | (pkt)->rport->port_id, \ | 76 | (pkt)->rport->port_id, \ |
77 | (_ep)->oxid, (_ep)->rxid, ##args); \ | 77 | (_ep)->oxid, (_ep)->rxid, ##args); \ |
78 | } else { \ | 78 | } else { \ |
79 | printk(KERN_INFO "host%u: fcp: %6.6x: " fmt, \ | 79 | pr_info("host%u: fcp: %6.6x: " fmt, \ |
80 | (pkt)->lp->host->host_no, \ | 80 | (pkt)->lp->host->host_no, \ |
81 | (pkt)->rport->port_id, ##args); \ | 81 | (pkt)->rport->port_id, ##args); \ |
82 | } \ | 82 | } \ |
@@ -84,14 +84,14 @@ extern unsigned int fc_debug_logging; | |||
84 | 84 | ||
85 | #define FC_EXCH_DBG(exch, fmt, args...) \ | 85 | #define FC_EXCH_DBG(exch, fmt, args...) \ |
86 | FC_CHECK_LOGGING(FC_EXCH_LOGGING, \ | 86 | FC_CHECK_LOGGING(FC_EXCH_LOGGING, \ |
87 | printk(KERN_INFO "host%u: xid %4x: " fmt, \ | 87 | pr_info("host%u: xid %4x: " fmt, \ |
88 | (exch)->lp->host->host_no, \ | 88 | (exch)->lp->host->host_no, \ |
89 | exch->xid, ##args)) | 89 | exch->xid, ##args)) |
90 | 90 | ||
91 | #define FC_SCSI_DBG(lport, fmt, args...) \ | 91 | #define FC_SCSI_DBG(lport, fmt, args...) \ |
92 | FC_CHECK_LOGGING(FC_SCSI_LOGGING, \ | 92 | FC_CHECK_LOGGING(FC_SCSI_LOGGING, \ |
93 | printk(KERN_INFO "host%u: scsi: " fmt, \ | 93 | pr_info("host%u: scsi: " fmt, \ |
94 | (lport)->host->host_no, ##args)) | 94 | (lport)->host->host_no, ##args)) |
95 | 95 | ||
96 | /* | 96 | /* |
97 | * FC-4 Providers. | 97 | * FC-4 Providers. |