openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[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>
This commit is contained in:
Kashyap, Desai 2010-11-13 04:29:20 +05:30 committed by James Bottomley
parent 1f768e91e1
commit 363fa50fc3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/mpt2sas/mpt2sas_ctl.c
View File

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

3
drivers/scsi/mpt2sas/mpt2sas_scsih.c
View File

@ -2715,9 +2715,10 @@ static u8
_scsih_sas_control_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid, _scsih_sas_control_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid,
u8 msix_index, u32 reply) u8 msix_index, u32 reply)
{ {
#ifdef CONFIG_SCSI_MPT2SAS_LOGGING
Mpi2SasIoUnitControlReply_t *mpi_reply = Mpi2SasIoUnitControlReply_t *mpi_reply =
mpt2sas_base_get_reply_virt_addr(ioc, reply); mpt2sas_base_get_reply_virt_addr(ioc, reply);
#endif
dewtprintk(ioc, printk(MPT2SAS_INFO_FMT dewtprintk(ioc, printk(MPT2SAS_INFO_FMT
"sc_complete:handle(0x%04x), (open) " "sc_complete:handle(0x%04x), (open) "
"smid(%d), ioc_status(0x%04x), loginfo(0x%08x)\n", "smid(%d), ioc_status(0x%04x), loginfo(0x%08x)\n",