diff options
author | Kashyap, Desai <kashyap.desai@lsi.com> | 2010-06-17 04:13:57 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 13:02:16 -0400 |
commit | eabb08ad2d3b0257cd2c9aed4f106fb39d14604a (patch) | |
tree | 5a9c7c22065cb775265185a265599dd082b44021 /drivers/scsi/mpt2sas/mpt2sas_ctl.c | |
parent | 570c67ac443dab5c46e5744e950f0539724cb65d (diff) |
[SCSI] mpt2sas: print level KERN_DEBUG is replaced by KERN_INFO
Converting print level from MPT2SAS_DEBUG_FMT to MPT2SAS_INFO_FMT.
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.c')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c index 371f063a926c..55fbd5b69b83 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c | |||
@@ -188,14 +188,14 @@ _ctl_display_some_debug(struct MPT2SAS_ADAPTER *ioc, u16 smid, | |||
188 | if (!desc) | 188 | if (!desc) |
189 | return; | 189 | return; |
190 | 190 | ||
191 | printk(MPT2SAS_DEBUG_FMT "%s: %s, smid(%d)\n", | 191 | printk(MPT2SAS_INFO_FMT "%s: %s, smid(%d)\n", |
192 | ioc->name, calling_function_name, desc, smid); | 192 | ioc->name, calling_function_name, desc, smid); |
193 | 193 | ||
194 | if (!mpi_reply) | 194 | if (!mpi_reply) |
195 | return; | 195 | return; |
196 | 196 | ||
197 | if (mpi_reply->IOCStatus || mpi_reply->IOCLogInfo) | 197 | if (mpi_reply->IOCStatus || mpi_reply->IOCLogInfo) |
198 | printk(MPT2SAS_DEBUG_FMT | 198 | printk(MPT2SAS_INFO_FMT |
199 | "\tiocstatus(0x%04x), loginfo(0x%08x)\n", | 199 | "\tiocstatus(0x%04x), loginfo(0x%08x)\n", |
200 | ioc->name, le16_to_cpu(mpi_reply->IOCStatus), | 200 | ioc->name, le16_to_cpu(mpi_reply->IOCStatus), |
201 | le32_to_cpu(mpi_reply->IOCLogInfo)); | 201 | le32_to_cpu(mpi_reply->IOCLogInfo)); |
@@ -206,7 +206,7 @@ _ctl_display_some_debug(struct MPT2SAS_ADAPTER *ioc, u16 smid, | |||
206 | Mpi2SCSIIOReply_t *scsi_reply = | 206 | Mpi2SCSIIOReply_t *scsi_reply = |
207 | (Mpi2SCSIIOReply_t *)mpi_reply; | 207 | (Mpi2SCSIIOReply_t *)mpi_reply; |
208 | if (scsi_reply->SCSIState || scsi_reply->SCSIStatus) | 208 | if (scsi_reply->SCSIState || scsi_reply->SCSIStatus) |
209 | printk(MPT2SAS_DEBUG_FMT | 209 | printk(MPT2SAS_INFO_FMT |
210 | "\tscsi_state(0x%02x), scsi_status" | 210 | "\tscsi_state(0x%02x), scsi_status" |
211 | "(0x%02x)\n", ioc->name, | 211 | "(0x%02x)\n", ioc->name, |
212 | scsi_reply->SCSIState, | 212 | scsi_reply->SCSIState, |
@@ -392,7 +392,7 @@ mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | |||
392 | 392 | ||
393 | switch (reset_phase) { | 393 | switch (reset_phase) { |
394 | case MPT2_IOC_PRE_RESET: | 394 | case MPT2_IOC_PRE_RESET: |
395 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 395 | dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " |
396 | "MPT2_IOC_PRE_RESET\n", ioc->name, __func__)); | 396 | "MPT2_IOC_PRE_RESET\n", ioc->name, __func__)); |
397 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { | 397 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { |
398 | if (!(ioc->diag_buffer_status[i] & | 398 | if (!(ioc->diag_buffer_status[i] & |
@@ -405,7 +405,7 @@ mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | |||
405 | } | 405 | } |
406 | break; | 406 | break; |
407 | case MPT2_IOC_AFTER_RESET: | 407 | case MPT2_IOC_AFTER_RESET: |
408 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 408 | dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " |
409 | "MPT2_IOC_AFTER_RESET\n", ioc->name, __func__)); | 409 | "MPT2_IOC_AFTER_RESET\n", ioc->name, __func__)); |
410 | if (ioc->ctl_cmds.status & MPT2_CMD_PENDING) { | 410 | if (ioc->ctl_cmds.status & MPT2_CMD_PENDING) { |
411 | ioc->ctl_cmds.status |= MPT2_CMD_RESET; | 411 | ioc->ctl_cmds.status |= MPT2_CMD_RESET; |
@@ -414,7 +414,7 @@ mpt2sas_ctl_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase) | |||
414 | } | 414 | } |
415 | break; | 415 | break; |
416 | case MPT2_IOC_DONE_RESET: | 416 | case MPT2_IOC_DONE_RESET: |
417 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 417 | dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " |
418 | "MPT2_IOC_DONE_RESET\n", ioc->name, __func__)); | 418 | "MPT2_IOC_DONE_RESET\n", ioc->name, __func__)); |
419 | 419 | ||
420 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { | 420 | for (i = 0; i < MPI2_DIAG_BUF_TYPE_COUNT; i++) { |
@@ -531,7 +531,7 @@ _ctl_set_task_mid(struct MPT2SAS_ADAPTER *ioc, struct mpt2_ioctl_command *karg, | |||
531 | spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags); | 531 | spin_unlock_irqrestore(&ioc->scsi_lookup_lock, flags); |
532 | 532 | ||
533 | if (!found) { | 533 | if (!found) { |
534 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 534 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " |
535 | "handle(0x%04x), lun(%d), no active mid!!\n", ioc->name, | 535 | "handle(0x%04x), lun(%d), no active mid!!\n", ioc->name, |
536 | desc, le16_to_cpu(tm_request->DevHandle), lun)); | 536 | desc, le16_to_cpu(tm_request->DevHandle), lun)); |
537 | tm_reply = ioc->ctl_cmds.reply; | 537 | tm_reply = ioc->ctl_cmds.reply; |
@@ -549,7 +549,7 @@ _ctl_set_task_mid(struct MPT2SAS_ADAPTER *ioc, struct mpt2_ioctl_command *karg, | |||
549 | return 1; | 549 | return 1; |
550 | } | 550 | } |
551 | 551 | ||
552 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 552 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " |
553 | "handle(0x%04x), lun(%d), task_mid(%d)\n", ioc->name, | 553 | "handle(0x%04x), lun(%d), task_mid(%d)\n", ioc->name, |
554 | desc, le16_to_cpu(tm_request->DevHandle), lun, | 554 | desc, le16_to_cpu(tm_request->DevHandle), lun, |
555 | le16_to_cpu(tm_request->TaskMID))); | 555 | le16_to_cpu(tm_request->TaskMID))); |
@@ -756,7 +756,7 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc, | |||
756 | Mpi2SCSITaskManagementRequest_t *tm_request = | 756 | Mpi2SCSITaskManagementRequest_t *tm_request = |
757 | (Mpi2SCSITaskManagementRequest_t *)mpi_request; | 757 | (Mpi2SCSITaskManagementRequest_t *)mpi_request; |
758 | 758 | ||
759 | dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "TASK_MGMT: " | 759 | dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "TASK_MGMT: " |
760 | "handle(0x%04x), task_type(0x%02x)\n", ioc->name, | 760 | "handle(0x%04x), task_type(0x%02x)\n", ioc->name, |
761 | le16_to_cpu(tm_request->DevHandle), tm_request->TaskType)); | 761 | le16_to_cpu(tm_request->DevHandle), tm_request->TaskType)); |
762 | 762 | ||
@@ -851,7 +851,7 @@ _ctl_do_mpt_command(struct MPT2SAS_ADAPTER *ioc, | |||
851 | Mpi2SCSITaskManagementReply_t *tm_reply = | 851 | Mpi2SCSITaskManagementReply_t *tm_reply = |
852 | (Mpi2SCSITaskManagementReply_t *)mpi_reply; | 852 | (Mpi2SCSITaskManagementReply_t *)mpi_reply; |
853 | 853 | ||
854 | printk(MPT2SAS_DEBUG_FMT "TASK_MGMT: " | 854 | printk(MPT2SAS_INFO_FMT "TASK_MGMT: " |
855 | "IOCStatus(0x%04x), IOCLogInfo(0x%08x), " | 855 | "IOCStatus(0x%04x), IOCLogInfo(0x%08x), " |
856 | "TerminationCount(0x%08x)\n", ioc->name, | 856 | "TerminationCount(0x%08x)\n", ioc->name, |
857 | le16_to_cpu(tm_reply->IOCStatus), | 857 | le16_to_cpu(tm_reply->IOCStatus), |
@@ -950,7 +950,7 @@ _ctl_getiocinfo(void __user *arg) | |||
950 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 950 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
951 | return -ENODEV; | 951 | return -ENODEV; |
952 | 952 | ||
953 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name, | 953 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name, |
954 | __func__)); | 954 | __func__)); |
955 | 955 | ||
956 | memset(&karg, 0 , sizeof(karg)); | 956 | memset(&karg, 0 , sizeof(karg)); |
@@ -998,7 +998,7 @@ _ctl_eventquery(void __user *arg) | |||
998 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 998 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
999 | return -ENODEV; | 999 | return -ENODEV; |
1000 | 1000 | ||
1001 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name, | 1001 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name, |
1002 | __func__)); | 1002 | __func__)); |
1003 | 1003 | ||
1004 | karg.event_entries = MPT2SAS_CTL_EVENT_LOG_SIZE; | 1004 | karg.event_entries = MPT2SAS_CTL_EVENT_LOG_SIZE; |
@@ -1031,7 +1031,7 @@ _ctl_eventenable(void __user *arg) | |||
1031 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1031 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1032 | return -ENODEV; | 1032 | return -ENODEV; |
1033 | 1033 | ||
1034 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name, | 1034 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name, |
1035 | __func__)); | 1035 | __func__)); |
1036 | 1036 | ||
1037 | if (ioc->event_log) | 1037 | if (ioc->event_log) |
@@ -1073,7 +1073,7 @@ _ctl_eventreport(void __user *arg) | |||
1073 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1073 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1074 | return -ENODEV; | 1074 | return -ENODEV; |
1075 | 1075 | ||
1076 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name, | 1076 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name, |
1077 | __func__)); | 1077 | __func__)); |
1078 | 1078 | ||
1079 | number_bytes = karg.hdr.max_data_size - | 1079 | number_bytes = karg.hdr.max_data_size - |
@@ -1118,7 +1118,7 @@ _ctl_do_reset(void __user *arg) | |||
1118 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1118 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1119 | return -ENODEV; | 1119 | return -ENODEV; |
1120 | 1120 | ||
1121 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name, | 1121 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name, |
1122 | __func__)); | 1122 | __func__)); |
1123 | 1123 | ||
1124 | retval = mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP, | 1124 | retval = mpt2sas_base_hard_reset_handler(ioc, CAN_SLEEP, |
@@ -1219,7 +1219,7 @@ _ctl_btdh_mapping(void __user *arg) | |||
1219 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1219 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1220 | return -ENODEV; | 1220 | return -ENODEV; |
1221 | 1221 | ||
1222 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1222 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
1223 | __func__)); | 1223 | __func__)); |
1224 | 1224 | ||
1225 | rc = _ctl_btdh_search_sas_device(ioc, &karg); | 1225 | rc = _ctl_btdh_search_sas_device(ioc, &karg); |
@@ -1288,7 +1288,7 @@ _ctl_diag_register_2(struct MPT2SAS_ADAPTER *ioc, | |||
1288 | u16 ioc_status; | 1288 | u16 ioc_status; |
1289 | u8 issue_reset = 0; | 1289 | u8 issue_reset = 0; |
1290 | 1290 | ||
1291 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1291 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
1292 | __func__)); | 1292 | __func__)); |
1293 | 1293 | ||
1294 | if (ioc->ctl_cmds.status != MPT2_CMD_NOT_USED) { | 1294 | if (ioc->ctl_cmds.status != MPT2_CMD_NOT_USED) { |
@@ -1376,7 +1376,7 @@ _ctl_diag_register_2(struct MPT2SAS_ADAPTER *ioc, | |||
1376 | mpi_request->VF_ID = 0; /* TODO */ | 1376 | mpi_request->VF_ID = 0; /* TODO */ |
1377 | mpi_request->VP_ID = 0; | 1377 | mpi_request->VP_ID = 0; |
1378 | 1378 | ||
1379 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: diag_buffer(0x%p), " | 1379 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: diag_buffer(0x%p), " |
1380 | "dma(0x%llx), sz(%d)\n", ioc->name, __func__, request_data, | 1380 | "dma(0x%llx), sz(%d)\n", ioc->name, __func__, request_data, |
1381 | (unsigned long long)request_data_dma, | 1381 | (unsigned long long)request_data_dma, |
1382 | le32_to_cpu(mpi_request->BufferLength))); | 1382 | le32_to_cpu(mpi_request->BufferLength))); |
@@ -1414,10 +1414,10 @@ _ctl_diag_register_2(struct MPT2SAS_ADAPTER *ioc, | |||
1414 | if (ioc_status == MPI2_IOCSTATUS_SUCCESS) { | 1414 | if (ioc_status == MPI2_IOCSTATUS_SUCCESS) { |
1415 | ioc->diag_buffer_status[buffer_type] |= | 1415 | ioc->diag_buffer_status[buffer_type] |= |
1416 | MPT2_DIAG_BUFFER_IS_REGISTERED; | 1416 | MPT2_DIAG_BUFFER_IS_REGISTERED; |
1417 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: success\n", | 1417 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: success\n", |
1418 | ioc->name, __func__)); | 1418 | ioc->name, __func__)); |
1419 | } else { | 1419 | } else { |
1420 | printk(MPT2SAS_DEBUG_FMT "%s: ioc_status(0x%04x) " | 1420 | printk(MPT2SAS_INFO_FMT "%s: ioc_status(0x%04x) " |
1421 | "log_info(0x%08x)\n", ioc->name, __func__, | 1421 | "log_info(0x%08x)\n", ioc->name, __func__, |
1422 | ioc_status, le32_to_cpu(mpi_reply->IOCLogInfo)); | 1422 | ioc_status, le32_to_cpu(mpi_reply->IOCLogInfo)); |
1423 | rc = -EFAULT; | 1423 | rc = -EFAULT; |
@@ -1541,7 +1541,7 @@ _ctl_diag_unregister(void __user *arg) | |||
1541 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1541 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1542 | return -ENODEV; | 1542 | return -ENODEV; |
1543 | 1543 | ||
1544 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1544 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
1545 | __func__)); | 1545 | __func__)); |
1546 | 1546 | ||
1547 | buffer_type = karg.unique_id & 0x000000ff; | 1547 | buffer_type = karg.unique_id & 0x000000ff; |
@@ -1611,7 +1611,7 @@ _ctl_diag_query(void __user *arg) | |||
1611 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1611 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1612 | return -ENODEV; | 1612 | return -ENODEV; |
1613 | 1613 | ||
1614 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1614 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
1615 | __func__)); | 1615 | __func__)); |
1616 | 1616 | ||
1617 | karg.application_flags = 0; | 1617 | karg.application_flags = 0; |
@@ -1689,7 +1689,7 @@ _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, u8 *issue_reset) | |||
1689 | int rc; | 1689 | int rc; |
1690 | unsigned long timeleft; | 1690 | unsigned long timeleft; |
1691 | 1691 | ||
1692 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1692 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
1693 | __func__)); | 1693 | __func__)); |
1694 | 1694 | ||
1695 | rc = 0; | 1695 | rc = 0; |
@@ -1697,7 +1697,7 @@ _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, u8 *issue_reset) | |||
1697 | 1697 | ||
1698 | ioc_state = mpt2sas_base_get_iocstate(ioc, 1); | 1698 | ioc_state = mpt2sas_base_get_iocstate(ioc, 1); |
1699 | if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) { | 1699 | if (ioc_state != MPI2_IOC_STATE_OPERATIONAL) { |
1700 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 1700 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " |
1701 | "skipping due to FAULT state\n", ioc->name, | 1701 | "skipping due to FAULT state\n", ioc->name, |
1702 | __func__)); | 1702 | __func__)); |
1703 | rc = -EAGAIN; | 1703 | rc = -EAGAIN; |
@@ -1759,10 +1759,10 @@ _ctl_send_release(struct MPT2SAS_ADAPTER *ioc, u8 buffer_type, u8 *issue_reset) | |||
1759 | if (ioc_status == MPI2_IOCSTATUS_SUCCESS) { | 1759 | if (ioc_status == MPI2_IOCSTATUS_SUCCESS) { |
1760 | ioc->diag_buffer_status[buffer_type] |= | 1760 | ioc->diag_buffer_status[buffer_type] |= |
1761 | MPT2_DIAG_BUFFER_IS_RELEASED; | 1761 | MPT2_DIAG_BUFFER_IS_RELEASED; |
1762 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: success\n", | 1762 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: success\n", |
1763 | ioc->name, __func__)); | 1763 | ioc->name, __func__)); |
1764 | } else { | 1764 | } else { |
1765 | printk(MPT2SAS_DEBUG_FMT "%s: ioc_status(0x%04x) " | 1765 | printk(MPT2SAS_INFO_FMT "%s: ioc_status(0x%04x) " |
1766 | "log_info(0x%08x)\n", ioc->name, __func__, | 1766 | "log_info(0x%08x)\n", ioc->name, __func__, |
1767 | ioc_status, le32_to_cpu(mpi_reply->IOCLogInfo)); | 1767 | ioc_status, le32_to_cpu(mpi_reply->IOCLogInfo)); |
1768 | rc = -EFAULT; | 1768 | rc = -EFAULT; |
@@ -1800,7 +1800,7 @@ _ctl_diag_release(void __user *arg, enum block_state state) | |||
1800 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1800 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1801 | return -ENODEV; | 1801 | return -ENODEV; |
1802 | 1802 | ||
1803 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1803 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
1804 | __func__)); | 1804 | __func__)); |
1805 | 1805 | ||
1806 | buffer_type = karg.unique_id & 0x000000ff; | 1806 | buffer_type = karg.unique_id & 0x000000ff; |
@@ -1896,7 +1896,7 @@ _ctl_diag_read_buffer(void __user *arg, enum block_state state) | |||
1896 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) | 1896 | if (_ctl_verify_adapter(karg.hdr.ioc_number, &ioc) == -1 || !ioc) |
1897 | return -ENODEV; | 1897 | return -ENODEV; |
1898 | 1898 | ||
1899 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, | 1899 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
1900 | __func__)); | 1900 | __func__)); |
1901 | 1901 | ||
1902 | buffer_type = karg.unique_id & 0x000000ff; | 1902 | buffer_type = karg.unique_id & 0x000000ff; |
@@ -1927,7 +1927,7 @@ _ctl_diag_read_buffer(void __user *arg, enum block_state state) | |||
1927 | } | 1927 | } |
1928 | 1928 | ||
1929 | diag_data = (void *)(request_data + karg.starting_offset); | 1929 | diag_data = (void *)(request_data + karg.starting_offset); |
1930 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: diag_buffer(%p), " | 1930 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: diag_buffer(%p), " |
1931 | "offset(%d), sz(%d)\n", ioc->name, __func__, | 1931 | "offset(%d), sz(%d)\n", ioc->name, __func__, |
1932 | diag_data, karg.starting_offset, karg.bytes_to_read)); | 1932 | diag_data, karg.starting_offset, karg.bytes_to_read)); |
1933 | 1933 | ||
@@ -1942,11 +1942,11 @@ _ctl_diag_read_buffer(void __user *arg, enum block_state state) | |||
1942 | if ((karg.flags & MPT2_FLAGS_REREGISTER) == 0) | 1942 | if ((karg.flags & MPT2_FLAGS_REREGISTER) == 0) |
1943 | return 0; | 1943 | return 0; |
1944 | 1944 | ||
1945 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: Reregister " | 1945 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: Reregister " |
1946 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type)); | 1946 | "buffer_type(0x%02x)\n", ioc->name, __func__, buffer_type)); |
1947 | if ((ioc->diag_buffer_status[buffer_type] & | 1947 | if ((ioc->diag_buffer_status[buffer_type] & |
1948 | MPT2_DIAG_BUFFER_IS_RELEASED) == 0) { | 1948 | MPT2_DIAG_BUFFER_IS_RELEASED) == 0) { |
1949 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " | 1949 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: " |
1950 | "buffer_type(0x%02x) is still registered\n", ioc->name, | 1950 | "buffer_type(0x%02x) is still registered\n", ioc->name, |
1951 | __func__, buffer_type)); | 1951 | __func__, buffer_type)); |
1952 | return 0; | 1952 | return 0; |
@@ -2020,10 +2020,10 @@ _ctl_diag_read_buffer(void __user *arg, enum block_state state) | |||
2020 | if (ioc_status == MPI2_IOCSTATUS_SUCCESS) { | 2020 | if (ioc_status == MPI2_IOCSTATUS_SUCCESS) { |
2021 | ioc->diag_buffer_status[buffer_type] |= | 2021 | ioc->diag_buffer_status[buffer_type] |= |
2022 | MPT2_DIAG_BUFFER_IS_REGISTERED; | 2022 | MPT2_DIAG_BUFFER_IS_REGISTERED; |
2023 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: success\n", | 2023 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: success\n", |
2024 | ioc->name, __func__)); | 2024 | ioc->name, __func__)); |
2025 | } else { | 2025 | } else { |
2026 | printk(MPT2SAS_DEBUG_FMT "%s: ioc_status(0x%04x) " | 2026 | printk(MPT2SAS_INFO_FMT "%s: ioc_status(0x%04x) " |
2027 | "log_info(0x%08x)\n", ioc->name, __func__, | 2027 | "log_info(0x%08x)\n", ioc->name, __func__, |
2028 | ioc_status, le32_to_cpu(mpi_reply->IOCLogInfo)); | 2028 | ioc_status, le32_to_cpu(mpi_reply->IOCLogInfo)); |
2029 | rc = -EFAULT; | 2029 | rc = -EFAULT; |
@@ -2140,7 +2140,7 @@ _ctl_ioctl_main(struct file *file, unsigned int cmd, void __user *arg) | |||
2140 | !ioc) | 2140 | !ioc) |
2141 | return -ENODEV; | 2141 | return -ENODEV; |
2142 | 2142 | ||
2143 | dctlprintk(ioc, printk(MPT2SAS_DEBUG_FMT | 2143 | dctlprintk(ioc, printk(MPT2SAS_INFO_FMT |
2144 | "unsupported ioctl opcode(0x%08x)\n", ioc->name, cmd)); | 2144 | "unsupported ioctl opcode(0x%08x)\n", ioc->name, cmd)); |
2145 | break; | 2145 | break; |
2146 | } | 2146 | } |