diff options
| author | Kashyap, Desai <kashyap.desai@lsi.com> | 2010-06-17 12:13:57 +0400 | 
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-07-27 21:02:16 +0400 | 
| commit | eabb08ad2d3b0257cd2c9aed4f106fb39d14604a (patch) | |
| tree | 5a9c7c22065cb775265185a265599dd082b44021 /drivers/scsi/mpt2sas/mpt2sas_base.c | |
| parent | 570c67ac443dab5c46e5744e950f0539724cb65d (diff) | |
| download | linux-eabb08ad2d3b0257cd2c9aed4f106fb39d14604a.tar.xz | |
[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.c | 82 | 
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)  	u64 pio_chip = 0;  	u64 chip_phys = 0; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n",  	    ioc->name, __func__));  	ioc->bars = pci_select_bars(pdev, IORESOURCE_MEM); @@ -1865,7 +1865,7 @@ _base_static_config_pages(struct MPT2SAS_ADAPTER *ioc)  static void  _base_release_memory_pools(struct MPT2SAS_ADAPTER *ioc)  { -	dexitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dexitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	if (ioc->request) { @@ -1951,7 +1951,7 @@ _base_allocate_memory_pools(struct MPT2SAS_ADAPTER *ioc,  int sleep_flag)  	u32 retry_sz;  	u16 max_request_credit; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	retry_sz = 0; @@ -2378,7 +2378,7 @@ _base_wait_for_doorbell_int(struct MPT2SAS_ADAPTER *ioc, int timeout,  	do {  		int_status = readl(&ioc->chip->HostInterruptStatus);  		if (int_status & MPI2_HIS_IOC2SYS_DB_STATUS) { -			dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " +			dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "  			    "successfull count(%d), timeout(%d)\n", ioc->name,  			    __func__, count, timeout));  			return 0; @@ -2419,7 +2419,7 @@ _base_wait_for_doorbell_ack(struct MPT2SAS_ADAPTER *ioc, int timeout,  	do {  		int_status = readl(&ioc->chip->HostInterruptStatus);  		if (!(int_status & MPI2_HIS_SYS2IOC_DB_STATUS)) { -			dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " +			dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "  			    "successfull count(%d), timeout(%d)\n", ioc->name,  			    __func__, count, timeout));  			return 0; @@ -2467,7 +2467,7 @@ _base_wait_for_doorbell_not_used(struct MPT2SAS_ADAPTER *ioc, int timeout,  	do {  		doorbell_reg = readl(&ioc->chip->Doorbell);  		if (!(doorbell_reg & MPI2_DOORBELL_USED)) { -			dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " +			dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "  			    "successfull count(%d), timeout(%d)\n", ioc->name,  			    __func__, count, timeout));  			return 0; @@ -2641,9 +2641,9 @@ _base_handshake_req_reply_wait(struct MPT2SAS_ADAPTER *ioc, int request_bytes,  	if (ioc->logging_level & MPT_DEBUG_INIT) {  		mfp = (u32 *)reply; -		printk(KERN_DEBUG "\toffset:data\n"); +		printk(KERN_INFO "\toffset:data\n");  		for (i = 0; i < reply_bytes/4; i++) -			printk(KERN_DEBUG "\t[0x%02x]:%08x\n", i*4, +			printk(KERN_INFO "\t[0x%02x]:%08x\n", i*4,  			    le32_to_cpu(mfp[i]));  	}  	return 0; @@ -2676,7 +2676,7 @@ mpt2sas_base_sas_iounit_control(struct MPT2SAS_ADAPTER *ioc,  	void *request;  	u16 wait_state_count; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	mutex_lock(&ioc->base_cmds.mutex); @@ -2781,7 +2781,7 @@ mpt2sas_base_scsi_enclosure_processor(struct MPT2SAS_ADAPTER *ioc,  	void *request;  	u16 wait_state_count; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	mutex_lock(&ioc->base_cmds.mutex); @@ -2869,7 +2869,7 @@ _base_get_port_facts(struct MPT2SAS_ADAPTER *ioc, int port, int sleep_flag)  	Mpi2PortFactsReply_t mpi_reply, *pfacts;  	int mpi_reply_sz, mpi_request_sz, r; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	mpi_reply_sz = sizeof(Mpi2PortFactsReply_t); @@ -2911,7 +2911,7 @@ _base_get_ioc_facts(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  	Mpi2IOCFactsReply_t mpi_reply, *facts;  	int mpi_reply_sz, mpi_request_sz, r; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	mpi_reply_sz = sizeof(Mpi2IOCFactsReply_t); @@ -2983,7 +2983,7 @@ _base_send_ioc_init(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  	struct timeval current_time;  	u16 ioc_status; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	memset(&mpi_request, 0, sizeof(Mpi2IOCInitRequest_t)); @@ -3044,9 +3044,9 @@ _base_send_ioc_init(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  		int i;  		mfp = (u32 *)&mpi_request; -		printk(KERN_DEBUG "\toffset:data\n"); +		printk(KERN_INFO "\toffset:data\n");  		for (i = 0; i < sizeof(Mpi2IOCInitRequest_t)/4; i++) -			printk(KERN_DEBUG "\t[0x%02x]:%08x\n", i*4, +			printk(KERN_INFO "\t[0x%02x]:%08x\n", i*4,  			    le32_to_cpu(mfp[i]));  	} @@ -3125,7 +3125,7 @@ _base_send_port_enable(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  			r = -ETIME;  		goto out;  	} else -		dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: complete\n", +		dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: complete\n",  		    ioc->name, __func__));  	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)  	int r = 0;  	int i; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	if (ioc->base_cmds.status & MPT2_CMD_PENDING) { @@ -3223,7 +3223,7 @@ _base_event_notification(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  		else  			r = -ETIME;  	} else -		dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: complete\n", +		dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: complete\n",  		    ioc->name, __func__));  	ioc->base_cmds.status = MPT2_CMD_NOT_USED;  	return r; @@ -3285,7 +3285,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  	_base_save_msix_table(ioc); -	drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "clear interrupts\n", +	drsprintk(ioc, printk(MPT2SAS_INFO_FMT "clear interrupts\n",  	    ioc->name));  	count = 0; @@ -3293,7 +3293,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  		/* Write magic sequence to WriteSequence register  		 * Loop until in diagnostic mode  		 */ -		drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "write magic " +		drsprintk(ioc, printk(MPT2SAS_INFO_FMT "write magic "  		    "sequence\n", ioc->name));  		writel(MPI2_WRSEQ_FLUSH_KEY_VALUE, &ioc->chip->WriteSequence);  		writel(MPI2_WRSEQ_1ST_KEY_VALUE, &ioc->chip->WriteSequence); @@ -3313,7 +3313,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  			goto out;  		host_diagnostic = readl(&ioc->chip->HostDiagnostic); -		drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "wrote magic " +		drsprintk(ioc, printk(MPT2SAS_INFO_FMT "wrote magic "  		    "sequence: count(%d), host_diagnostic(0x%08x)\n",  		    ioc->name, count, host_diagnostic)); @@ -3321,7 +3321,7 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  	hcb_size = readl(&ioc->chip->HCBSize); -	drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "diag reset: issued\n", +	drsprintk(ioc, printk(MPT2SAS_INFO_FMT "diag reset: issued\n",  	    ioc->name));  	writel(host_diagnostic | MPI2_DIAG_RESET_ADAPTER,  	     &ioc->chip->HostDiagnostic); @@ -3348,29 +3348,29 @@ _base_diag_reset(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  	if (host_diagnostic & MPI2_DIAG_HCB_MODE) { -		drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "restart the adapter " +		drsprintk(ioc, printk(MPT2SAS_INFO_FMT "restart the adapter "  		    "assuming the HCB Address points to good F/W\n",  		    ioc->name));  		host_diagnostic &= ~MPI2_DIAG_BOOT_DEVICE_SELECT_MASK;  		host_diagnostic |= MPI2_DIAG_BOOT_DEVICE_SELECT_HCDW;  		writel(host_diagnostic, &ioc->chip->HostDiagnostic); -		drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT +		drsprintk(ioc, printk(MPT2SAS_INFO_FMT  		    "re-enable the HCDW\n", ioc->name));  		writel(hcb_size | MPI2_HCB_SIZE_HCB_ENABLE,  		    &ioc->chip->HCBSize);  	} -	drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "restart the adapter\n", +	drsprintk(ioc, printk(MPT2SAS_INFO_FMT "restart the adapter\n",  	    ioc->name));  	writel(host_diagnostic & ~MPI2_DIAG_HOLD_IOC_RESET,  	    &ioc->chip->HostDiagnostic); -	drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "disable writes to the " +	drsprintk(ioc, printk(MPT2SAS_INFO_FMT "disable writes to the "  	    "diagnostic register\n", ioc->name));  	writel(MPI2_WRSEQ_FLUSH_KEY_VALUE, &ioc->chip->WriteSequence); -	drsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "Wait for FW to go to the " +	drsprintk(ioc, printk(MPT2SAS_INFO_FMT "Wait for FW to go to the "  	    "READY state\n", ioc->name));  	ioc_state = _base_wait_on_iocstate(ioc, MPI2_IOC_STATE_READY, 20,  	    sleep_flag); @@ -3404,18 +3404,18 @@ _base_make_ioc_ready(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,  	u32 ioc_state;  	int rc; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	ioc_state = mpt2sas_base_get_iocstate(ioc, 0); -	dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: ioc_state(0x%08x)\n", +	dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: ioc_state(0x%08x)\n",  	    ioc->name, __func__, ioc_state));  	if ((ioc_state & MPI2_IOC_STATE_MASK) == MPI2_IOC_STATE_READY)  		return 0;  	if (ioc_state & MPI2_DOORBELL_USED) { -		dhsprintk(ioc, printk(MPT2SAS_DEBUG_FMT "unexpected doorbell " +		dhsprintk(ioc, printk(MPT2SAS_INFO_FMT "unexpected doorbell "  		    "active!\n", ioc->name));  		goto issue_diag_reset;  	} @@ -3458,7 +3458,7 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, int sleep_flag)  	u16 smid;  	struct _tr_list *delayed_tr, *delayed_tr_next; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	/* clean the delayed target reset list */ @@ -3554,7 +3554,7 @@ mpt2sas_base_free_resources(struct MPT2SAS_ADAPTER *ioc)  {  	struct pci_dev *pdev = ioc->pdev; -	dexitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dexitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	_base_mask_interrupts(ioc); @@ -3587,7 +3587,7 @@ mpt2sas_base_attach(struct MPT2SAS_ADAPTER *ioc)  {  	int r, i; -	dinitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	r = mpt2sas_base_map_resources(ioc); @@ -3719,7 +3719,7 @@ void  mpt2sas_base_detach(struct MPT2SAS_ADAPTER *ioc)  { -	dexitprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s\n", ioc->name, +	dexitprintk(ioc, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,  	    __func__));  	mpt2sas_base_stop_watchdog(ioc); @@ -3752,11 +3752,11 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)  {  	switch (reset_phase) {  	case MPT2_IOC_PRE_RESET: -		dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " +		dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "  		    "MPT2_IOC_PRE_RESET\n", ioc->name, __func__));  		break;  	case MPT2_IOC_AFTER_RESET: -		dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " +		dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "  		    "MPT2_IOC_AFTER_RESET\n", ioc->name, __func__));  		if (ioc->transport_cmds.status & MPT2_CMD_PENDING) {  			ioc->transport_cmds.status |= MPT2_CMD_RESET; @@ -3776,7 +3776,7 @@ _base_reset_handler(struct MPT2SAS_ADAPTER *ioc, int reset_phase)  		}  		break;  	case MPT2_IOC_DONE_RESET: -		dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: " +		dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: "  		    "MPT2_IOC_DONE_RESET\n", ioc->name, __func__));  		break;  	} @@ -3836,7 +3836,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,  	int r;  	unsigned long flags; -	dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: enter\n", ioc->name, +	dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: enter\n", ioc->name,  	    __func__));  	if (mpt2sas_fwfault_debug) @@ -3854,7 +3854,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,  		do {  			ssleep(1);  		} while (ioc->shost_recovery == 1); -		dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: exit\n", ioc->name, +		dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: exit\n", ioc->name,  		    __func__));  		return ioc->ioc_reset_in_progress_status;  	} @@ -3874,7 +3874,7 @@ mpt2sas_base_hard_reset_handler(struct MPT2SAS_ADAPTER *ioc, int sleep_flag,  	if (!r)  		_base_reset_handler(ioc, MPT2_IOC_DONE_RESET);   out: -	dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: %s\n", +	dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: %s\n",  	    ioc->name, __func__, ((r == 0) ? "SUCCESS" : "FAILED")));  	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,  	spin_unlock_irqrestore(&ioc->ioc_reset_in_progress_lock, flags);  	mutex_unlock(&ioc->reset_in_progress_mutex); -	dtmprintk(ioc, printk(MPT2SAS_DEBUG_FMT "%s: exit\n", ioc->name, +	dtmprintk(ioc, printk(MPT2SAS_INFO_FMT "%s: exit\n", ioc->name,  	    __func__));  	return r;  }  | 
