aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/mpt2sas/mpt2sas_base.c
diff options
context:
space:
mode:
authorKashyap, Desai <kashyap.desai@lsi.com>2010-06-17 04:13:57 -0400
committerJames Bottomley <James.Bottomley@suse.de>2010-07-27 13:02:16 -0400
commiteabb08ad2d3b0257cd2c9aed4f106fb39d14604a (patch)
tree5a9c7c22065cb775265185a265599dd082b44021 /drivers/scsi/mpt2sas/mpt2sas_base.c
parent570c67ac443dab5c46e5744e950f0539724cb65d (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_base.c')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.c82
1 files changed, 41 insertions, 41 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index 93c06239d951..3774b0742b2b 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -1242,7 +1242,7 @@ mpt2sas_base_map_resources(struct MPT2SAS_ADAPTER *ioc)
1242 u64 pio_chip = 0; 1242 u64 pio_chip = 0;
1243 u64 chip_phys = 0; 1243 u64 chip_phys = 0;
1244 1244
1245 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", 1245 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n",
1246 ioc->name, __func__)); 1246 ioc->name, __func__));
1247 1247
1248 ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM); 1248 ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM);
@@ -1865,7 +1865,7 @@ _base_static_config_pages(struct MPT2SAS_ADAPTER *ioc)
1865static void 1865static void
1866_base_release_memory_pools(struct MPT2SAS_ADAPTER *ioc) 1866_base_release_memory_pools(struct MPT2SAS_ADAPTER *ioc)
1867{ 1867{
1868 dexitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 1868 dexitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
1869 __func__)); 1869 __func__));
1870 1870
1871 if (ioc->request) { 1871 if (ioc->request) {
@@ -1951,7 +1951,7 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
1951 u32 retry_sz; 1951 u32 retry_sz;
1952 u16 max_request_credit; 1952 u16 max_request_credit;
1953 1953
1954 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 1954 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
1955 __func__)); 1955 __func__));
1956 1956
1957 retry_sz = 0; 1957 retry_sz = 0;
@@ -2378,7 +2378,7 @@ _base_wait_for_doorbell_int(struct MPT2SAS_ADAPTER *ioc, int timeout,
2378 do { 2378 do {
2379 int_status = readl(&ioc->chip->HostInterruptStatus); 2379 int_status = readl(&ioc->chip->HostInterruptStatus);
2380 if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { 2380 if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) {
2381 dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " 2381 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2382 "successfull count(%d), timeout(%d)\n", ioc->name, 2382 "successfull count(%d), timeout(%d)\n", ioc->name,
2383 __func__, count, timeout)); 2383 __func__, count, timeout));
2384 return 0; 2384 return 0;
@@ -2419,7 +2419,7 @@ _base_wait_for_doorbell_ack(struct MPT2SAS_ADAPTER *ioc, int timeout,
2419 do { 2419 do {
2420 int_status = readl(&ioc->chip->HostInterruptStatus); 2420 int_status = readl(&ioc->chip->HostInterruptStatus);
2421 if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) { 2421 if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) {
2422 dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " 2422 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2423 "successfull count(%d), timeout(%d)\n", ioc->name, 2423 "successfull count(%d), timeout(%d)\n", ioc->name,
2424 __func__, count, timeout)); 2424 __func__, count, timeout));
2425 return 0; 2425 return 0;
@@ -2467,7 +2467,7 @@ _base_wait_for_doorbell_not_used(struct MPT2SAS_ADAPTER *ioc, int timeout,
2467 do { 2467 do {
2468 doorbell_reg = readl(&ioc->chip->Doorbell); 2468 doorbell_reg = readl(&ioc->chip->Doorbell);
2469 if (!(doorbell_reg & MPI2_DOORBELL_USED)) { 2469 if (!(doorbell_reg & MPI2_DOORBELL_USED)) {
2470 dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " 2470 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
2471 "successfull count(%d), timeout(%d)\n", ioc->name, 2471 "successfull count(%d), timeout(%d)\n", ioc->name,
2472 __func__, count, timeout)); 2472 __func__, count, timeout));
2473 return 0; 2473 return 0;
@@ -2641,9 +2641,9 @@ _base_handshake_req_reply_wait(struct MPT2SAS_ADAPTER *ioc, int request_bytes,
2641 2641
2642 if (ioc->logging_level & MPT_DEBUG_INIT) { 2642 if (ioc->logging_level & MPT_DEBUG_INIT) {
2643 mfp = (u32 *)reply; 2643 mfp = (u32 *)reply;
2644 printk(KERN_DEBUG "\toffset:data\n"); 2644 printk(KERN_INFO "\toffset:data\n");
2645 for (i = 0; i < reply_bytes/4; i++) 2645 for (i = 0; i < reply_bytes/4; i++)
2646 printk(KERN_DEBUG "\t[0x%02x]:%08x\n", i*4, 2646 printk(KERN_INFO "\t[0x%02x]:%08x\n", i*4,
2647 le32_to_cpu(mfp[i])); 2647 le32_to_cpu(mfp[i]));
2648 } 2648 }
2649 return 0; 2649 return 0;
@@ -2676,7 +2676,7 @@ mpt2sas_base_sas_iounit_control(struct MPT2SAS_ADAPTER *ioc,
2676 void *request; 2676 void *request;
2677 u16 wait_state_count; 2677 u16 wait_state_count;
2678 2678
2679 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 2679 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
2680 __func__)); 2680 __func__));
2681 2681
2682 mutex_lock(&ioc->base_cmds.mutex); 2682 mutex_lock(&ioc->base_cmds.mutex);
@@ -2781,7 +2781,7 @@ mpt2sas_base_scsi_enclosure_processor(struct MPT2SAS_ADAPTER *ioc,
2781 void *request; 2781 void *request;
2782 u16 wait_state_count; 2782 u16 wait_state_count;
2783 2783
2784 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 2784 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
2785 __func__)); 2785 __func__));
2786 2786
2787 mutex_lock(&ioc->base_cmds.mutex); 2787 mutex_lock(&ioc->base_cmds.mutex);
@@ -2869,7 +2869,7 @@ _base_get_port_facts(struct MPT2SAS_ADAPTER *ioc, int port, int sleep_flag)
2869 Mpi2PortFactsReply_t mpi_reply, *pfacts; 2869 Mpi2PortFactsReply_t mpi_reply, *pfacts;
2870 int mpi_reply_sz, mpi_request_sz, r; 2870 int mpi_reply_sz, mpi_request_sz, r;
2871 2871
2872 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 2872 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
2873 __func__)); 2873 __func__));
2874 2874
2875 mpi_reply_sz = sizeof(Mpi2PortFactsReply_t); 2875 mpi_reply_sz = sizeof(Mpi2PortFactsReply_t);
@@ -2911,7 +2911,7 @@ _base_get_ioc_facts(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
2911 Mpi2IOCFactsReply_t mpi_reply, *facts; 2911 Mpi2IOCFactsReply_t mpi_reply, *facts;
2912 int mpi_reply_sz, mpi_request_sz, r; 2912 int mpi_reply_sz, mpi_request_sz, r;
2913 2913
2914 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 2914 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
2915 __func__)); 2915 __func__));
2916 2916
2917 mpi_reply_sz = sizeof(Mpi2IOCFactsReply_t); 2917 mpi_reply_sz = sizeof(Mpi2IOCFactsReply_t);
@@ -2983,7 +2983,7 @@ _base_send_ioc_init(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
2983 struct timeval current_time; 2983 struct timeval current_time;
2984 u16 ioc_status; 2984 u16 ioc_status;
2985 2985
2986 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 2986 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
2987 __func__)); 2987 __func__));
2988 2988
2989 memset(&mpi_request, 0, sizeof(Mpi2IOCInitRequest_t)); 2989 memset(&mpi_request, 0, sizeof(Mpi2IOCInitRequest_t));
@@ -3044,9 +3044,9 @@ _base_send_ioc_init(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3044 int i; 3044 int i;
3045 3045
3046 mfp = (u32 *)&mpi_request; 3046 mfp = (u32 *)&mpi_request;
3047 printk(KERN_DEBUG "\toffset:data\n"); 3047 printk(KERN_INFO "\toffset:data\n");
3048 for (i = 0; i < sizeof(Mpi2IOCInitRequest_t)/4; i++) 3048 for (i = 0; i < sizeof(Mpi2IOCInitRequest_t)/4; i++)
3049 printk(KERN_DEBUG "\t[0x%02x]:%08x\n", i*4, 3049 printk(KERN_INFO "\t[0x%02x]:%08x\n", i*4,
3050 le32_to_cpu(mfp[i])); 3050 le32_to_cpu(mfp[i]));
3051 } 3051 }
3052 3052
@@ -3125,7 +3125,7 @@ _base_send_port_enable(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3125 r = -ETIME; 3125 r = -ETIME;
3126 goto out; 3126 goto out;
3127 } else 3127 } else
3128 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: complete\n", 3128 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: complete\n",
3129 ioc->name, __func__)); 3129 ioc->name, __func__));
3130 3130
3131 ioc_state = _base_wait_on_iocstate(ioc, MPI2_IOC_STATE_OPERATIONAL, 3131 ioc_state = _base_wait_on_iocstate(ioc, MPI2_IOC_STATE_OPERATIONAL,
@@ -3185,7 +3185,7 @@ _base_event_notification(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3185 int r = 0; 3185 int r = 0;
3186 int i; 3186 int i;
3187 3187
3188 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 3188 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
3189 __func__)); 3189 __func__));
3190 3190
3191 if (ioc->base_cmds.status & MPT2_CMD_PENDING) { 3191 if (ioc->base_cmds.status & MPT2_CMD_PENDING) {
@@ -3223,7 +3223,7 @@ _base_event_notification(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3223 else 3223 else
3224 r = -ETIME; 3224 r = -ETIME;
3225 } else 3225 } else
3226 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: complete\n", 3226 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: complete\n",
3227 ioc->name, __func__)); 3227 ioc->name, __func__));
3228 ioc->base_cmds.status = MPT2_CMD_NOT_USED; 3228 ioc->base_cmds.status = MPT2_CMD_NOT_USED;
3229 return r; 3229 return r;
@@ -3285,7 +3285,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3285 3285
3286 _base_save_msix_table(ioc); 3286 _base_save_msix_table(ioc);
3287 3287
3288 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "clear interrupts\n", 3288 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "clear interrupts\n",
3289 ioc->name)); 3289 ioc->name));
3290 3290
3291 count = 0; 3291 count = 0;
@@ -3293,7 +3293,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3293 /* Write magic sequence to WriteSequence register 3293 /* Write magic sequence to WriteSequence register
3294 * Loop until in diagnostic mode 3294 * Loop until in diagnostic mode
3295 */ 3295 */
3296 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "write magic " 3296 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "write magic "
3297 "sequence\n", ioc->name)); 3297 "sequence\n", ioc->name));
3298 writel(MPI2_WRSEQ_FLUSH_KEY_VALUE, &ioc->chip->WriteSequence); 3298 writel(MPI2_WRSEQ_FLUSH_KEY_VALUE, &ioc->chip->WriteSequence);
3299 writel(MPI2_WRSEQ_1ST_KEY_VALUE, &ioc->chip->WriteSequence); 3299 writel(MPI2_WRSEQ_1ST_KEY_VALUE, &ioc->chip->WriteSequence);
@@ -3313,7 +3313,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3313 goto out; 3313 goto out;
3314 3314
3315 host_diagnostic = readl(&ioc->chip->HostDiagnostic); 3315 host_diagnostic = readl(&ioc->chip->HostDiagnostic);
3316 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "wrote magic " 3316 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "wrote magic "
3317 "sequence: count(%d), host_diagnostic(0x%08x)\n", 3317 "sequence: count(%d), host_diagnostic(0x%08x)\n",
3318 ioc->name, count, host_diagnostic)); 3318 ioc->name, count, host_diagnostic));
3319 3319
@@ -3321,7 +3321,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3321 3321
3322 hcb_size = readl(&ioc->chip->HCBSize); 3322 hcb_size = readl(&ioc->chip->HCBSize);
3323 3323
3324 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "diag reset: issued\n", 3324 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "diag reset: issued\n",
3325 ioc->name)); 3325 ioc->name));
3326 writel(host_diagnostic | MPI2_DIAG_RESET_ADAPTER, 3326 writel(host_diagnostic | MPI2_DIAG_RESET_ADAPTER,
3327 &ioc->chip->HostDiagnostic); 3327 &ioc->chip->HostDiagnostic);
@@ -3348,29 +3348,29 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3348 3348
3349 if (host_diagnostic & MPI2_DIAG_HCB_MODE) { 3349 if (host_diagnostic & MPI2_DIAG_HCB_MODE) {
3350 3350
3351 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "restart the adapter " 3351 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "restart the adapter "
3352 "assuming the HCB Address points to good F/W\n", 3352 "assuming the HCB Address points to good F/W\n",
3353 ioc->name)); 3353 ioc->name));
3354 host_diagnostic &= ~MPI2_DIAG_BOOT_DEVICE_SELECT_MASK; 3354 host_diagnostic &= ~MPI2_DIAG_BOOT_DEVICE_SELECT_MASK;
3355 host_diagnostic |= MPI2_DIAG_BOOT_DEVICE_SELECT_HCDW; 3355 host_diagnostic |= MPI2_DIAG_BOOT_DEVICE_SELECT_HCDW;
3356 writel(host_diagnostic, &ioc->chip->HostDiagnostic); 3356 writel(host_diagnostic, &ioc->chip->HostDiagnostic);
3357 3357
3358 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT 3358 drsprintk(ioc, printk(MPT2SAS_INFO_FMT
3359 "re-enable the HCDW\n", ioc->name)); 3359 "re-enable the HCDW\n", ioc->name));
3360 writel(hcb_size | MPI2_HCB_SIZE_HCB_ENABLE, 3360 writel(hcb_size | MPI2_HCB_SIZE_HCB_ENABLE,
3361 &ioc->chip->HCBSize); 3361 &ioc->chip->HCBSize);
3362 } 3362 }
3363 3363
3364 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "restart the adapter\n", 3364 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "restart the adapter\n",
3365 ioc->name)); 3365 ioc->name));
3366 writel(host_diagnostic & ~MPI2_DIAG_HOLD_IOC_RESET, 3366 writel(host_diagnostic & ~MPI2_DIAG_HOLD_IOC_RESET,
3367 &ioc->chip->HostDiagnostic); 3367 &ioc->chip->HostDiagnostic);
3368 3368
3369 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "disable writes to the " 3369 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "disable writes to the "
3370 "diagnostic register\n", ioc->name)); 3370 "diagnostic register\n", ioc->name));
3371 writel(MPI2_WRSEQ_FLUSH_KEY_VALUE, &ioc->chip->WriteSequence); 3371 writel(MPI2_WRSEQ_FLUSH_KEY_VALUE, &ioc->chip->WriteSequence);
3372 3372
3373 drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "Wait for FW to go to the " 3373 drsprintk(ioc, printk(MPT2SAS_INFO_FMT "Wait for FW to go to the "
3374 "READY state\n", ioc->name)); 3374 "READY state\n", ioc->name));
3375 ioc_state = _base_wait_on_iocstate(ioc, MPI2_IOC_STATE_READY, 20, 3375 ioc_state = _base_wait_on_iocstate(ioc, MPI2_IOC_STATE_READY, 20,
3376 sleep_flag); 3376 sleep_flag);
@@ -3404,18 +3404,18 @@ _base_make_ioc_ready(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
3404 u32 ioc_state; 3404 u32 ioc_state;
3405 int rc; 3405 int rc;
3406 3406
3407 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 3407 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
3408 __func__)); 3408 __func__));
3409 3409
3410 ioc_state = mpt2sas_base_get_iocstate(ioc, 0); 3410 ioc_state = mpt2sas_base_get_iocstate(ioc, 0);
3411 dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: ioc_state(0x%08x)\n", 3411 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: ioc_state(0x%08x)\n",
3412 ioc->name, __func__, ioc_state)); 3412 ioc->name, __func__, ioc_state));
3413 3413
3414 if ((ioc_state & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_READY) 3414 if ((ioc_state & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_READY)
3415 return 0; 3415 return 0;
3416 3416
3417 if (ioc_state & MPI2_DOORBELL_USED) { 3417 if (ioc_state & MPI2_DOORBELL_USED) {
3418 dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "unexpected doorbell " 3418 dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "unexpected doorbell "
3419 "active!\n", ioc->name)); 3419 "active!\n", ioc->name));
3420 goto issue_diag_reset; 3420 goto issue_diag_reset;
3421 } 3421 }
@@ -3458,7 +3458,7 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)
3458 u16 smid; 3458 u16 smid;
3459 struct _tr_list *delayed_tr, *delayed_tr_next; 3459 struct _tr_list *delayed_tr, *delayed_tr_next;
3460 3460
3461 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 3461 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
3462 __func__)); 3462 __func__));
3463 3463
3464 /* clean the delayed target reset list */ 3464 /* clean the delayed target reset list */
@@ -3554,7 +3554,7 @@ mpt2sas_base_free_resources(struct MPT2SAS_ADAPTER *ioc)
3554{ 3554{
3555 struct pci_dev *pdev = ioc->pdev; 3555 struct pci_dev *pdev = ioc->pdev;
3556 3556
3557 dexitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 3557 dexitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
3558 __func__)); 3558 __func__));
3559 3559
3560 _base_mask_interrupts(ioc); 3560 _base_mask_interrupts(ioc);
@@ -3587,7 +3587,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)
3587{ 3587{
3588 int r, i; 3588 int r, i;
3589 3589
3590 dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 3590 dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
3591 __func__)); 3591 __func__));
3592 3592
3593 r = mpt2sas_base_map_resources(ioc); 3593 r = mpt2sas_base_map_resources(ioc);
@@ -3719,7 +3719,7 @@ void
3719mpt2sas_base_detach(struct MPT2SAS_ADAPTER *ioc) 3719mpt2sas_base_detach(struct MPT2SAS_ADAPTER *ioc)
3720{ 3720{
3721 3721
3722 dexitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, 3722 dexitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
3723 __func__)); 3723 __func__));
3724 3724
3725 mpt2sas_base_stop_watchdog(ioc); 3725 mpt2sas_base_stop_watchdog(ioc);
@@ -3752,11 +3752,11 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)
3752{ 3752{
3753 switch (reset_phase) { 3753 switch (reset_phase) {
3754 case MPT2_IOC_PRE_RESET: 3754 case MPT2_IOC_PRE_RESET:
3755 dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " 3755 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
3756 "MPT2_IOC_PRE_RESET\n", ioc->name, __func__)); 3756 "MPT2_IOC_PRE_RESET\n", ioc->name, __func__));
3757 break; 3757 break;
3758 case MPT2_IOC_AFTER_RESET: 3758 case MPT2_IOC_AFTER_RESET:
3759 dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " 3759 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
3760 "MPT2_IOC_AFTER_RESET\n", ioc->name, __func__)); 3760 "MPT2_IOC_AFTER_RESET\n", ioc->name, __func__));
3761 if (ioc->transport_cmds.status & MPT2_CMD_PENDING) { 3761 if (ioc->transport_cmds.status & MPT2_CMD_PENDING) {
3762 ioc->transport_cmds.status |= MPT2_CMD_RESET; 3762 ioc->transport_cmds.status |= MPT2_CMD_RESET;
@@ -3776,7 +3776,7 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)
3776 } 3776 }
3777 break; 3777 break;
3778 case MPT2_IOC_DONE_RESET: 3778 case MPT2_IOC_DONE_RESET:
3779 dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " 3779 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "
3780 "MPT2_IOC_DONE_RESET\n", ioc->name, __func__)); 3780 "MPT2_IOC_DONE_RESET\n", ioc->name, __func__));
3781 break; 3781 break;
3782 } 3782 }
@@ -3836,7 +3836,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
3836 int r; 3836 int r;
3837 unsigned long flags; 3837 unsigned long flags;
3838 3838
3839 dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name, 3839 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,
3840 __func__)); 3840 __func__));
3841 3841
3842 if (mpt2sas_fwfault_debug) 3842 if (mpt2sas_fwfault_debug)
@@ -3854,7 +3854,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
3854 do { 3854 do {
3855 ssleep(1); 3855 ssleep(1);
3856 } while (ioc->shost_recovery == 1); 3856 } while (ioc->shost_recovery == 1);
3857 dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: exit\n", ioc->name, 3857 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: exit\n", ioc->name,
3858 __func__)); 3858 __func__));
3859 return ioc->ioc_reset_in_progress_status; 3859 return ioc->ioc_reset_in_progress_status;
3860 } 3860 }
@@ -3874,7 +3874,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
3874 if (!r) 3874 if (!r)
3875 _base_reset_handler(ioc, MPT2_IOC_DONE_RESET); 3875 _base_reset_handler(ioc, MPT2_IOC_DONE_RESET);
3876 out: 3876 out:
3877 dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: %s\n", 3877 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: %s\n",
3878 ioc->name, __func__, ((r == 0) ? "SUCCESS" : "FAILED"))); 3878 ioc->name, __func__, ((r == 0) ? "SUCCESS" : "FAILED")));
3879 3879
3880 spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags); 3880 spin_lock_irqsave(&ioc->ioc_reset_in_progress_lock, flags);
@@ -3884,7 +3884,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,
3884 spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags); 3884 spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);
3885 mutex_unlock(&ioc->reset_in_progress_mutex); 3885 mutex_unlock(&ioc->reset_in_progress_mutex);
3886 3886
3887 dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: exit\n", ioc->name, 3887 dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: exit\n", ioc->name,
3888 __func__)); 3888 __func__));
3889 return r; 3889 return r;
3890} 3890}