Commit 363fa50f authored Nov 13, 2010 by Kashyap, Desai Committed by James Bottomley Dec 21, 2010

[SCSI] mpt2sas: Removed compiler warnnings when logging is disabled



The compiler throws warning messages while compiling without
CONFIG_SCSI_MPT2SAS_LOGGING.
Set proper ifdef for CONFIG_SCSI_MPT2SAS_LOGGING to avoid warnnings.

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

parent 1f768e91

drivers/scsi/mpt2sas/mpt2sas_ctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -81,6 +81,7 @@ enum block_state {
		BLOCKING,
		};

		#ifdef CONFIG_SCSI_MPT2SAS_LOGGING
		/**
		* _ctl_sas_device_find_by_handle - sas device search
		* @ioc: per adapter object
		@@ -107,7 +108,6 @@ _ctl_sas_device_find_by_handle(struct MPT2SAS_ADAPTER *ioc, u16 handle)
		return r;
		}

		#ifdef CONFIG_SCSI_MPT2SAS_LOGGING
		/**
		* _ctl_display_some_debug - debug routine
		* @ioc: per adapter object

drivers/scsi/mpt2sas/mpt2sas_scsih.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2715,9 +2715,10 @@ static u8
		_scsih_sas_control_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid,
		u8 msix_index, u32 reply)
		{
		#ifdef CONFIG_SCSI_MPT2SAS_LOGGING
		Mpi2SasIoUnitControlReply_t *mpi_reply =
		mpt2sas_base_get_reply_virt_addr(ioc, reply);

		#endif
		dewtprintk(ioc, printk(MPT2SAS_INFO_FMT
		"sc_complete:handle(0x%04x), (open) "
		"smid(%d), ioc_status(0x%04x), loginfo(0x%08x)\n",