diff options
author | Kashyap, Desai <kashyap.desai@lsi.com> | 2010-11-12 17:59:20 -0500 |
---|---|---|
committer | James Bottomley <James.Bottomley@suse.de> | 2010-12-21 13:24:02 -0500 |
commit | 363fa50fc35357b1361fb63b0726335de993374a (patch) | |
tree | b121e3cff170fa11d7caa3a7af64a321aab51043 | |
parent | 1f768e91e1fcd9f0df657783847347a833fdc573 (diff) |
[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>
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_ctl.c | 2 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_scsih.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c index 40cb8aeb21b1..e92b77af5484 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c +++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c | |||
@@ -81,6 +81,7 @@ enum block_state { | |||
81 | BLOCKING, | 81 | BLOCKING, |
82 | }; | 82 | }; |
83 | 83 | ||
84 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING | ||
84 | /** | 85 | /** |
85 | * _ctl_sas_device_find_by_handle - sas device search | 86 | * _ctl_sas_device_find_by_handle - sas device search |
86 | * @ioc: per adapter object | 87 | * @ioc: per adapter object |
@@ -107,7 +108,6 @@ _ctl_sas_device_find_by_handle(struct MPT2SAS_ADAPTER *ioc, u16 handle) | |||
107 | return r; | 108 | return r; |
108 | } | 109 | } |
109 | 110 | ||
110 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING | ||
111 | /** | 111 | /** |
112 | * _ctl_display_some_debug - debug routine | 112 | * _ctl_display_some_debug - debug routine |
113 | * @ioc: per adapter object | 113 | * @ioc: per adapter object |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index 1a96a00418a4..5af5781d9464 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
@@ -2715,9 +2715,10 @@ static u8 | |||
2715 | _scsih_sas_control_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid, | 2715 | _scsih_sas_control_complete(struct MPT2SAS_ADAPTER *ioc, u16 smid, |
2716 | u8 msix_index, u32 reply) | 2716 | u8 msix_index, u32 reply) |
2717 | { | 2717 | { |
2718 | #ifdef CONFIG_SCSI_MPT2SAS_LOGGING | ||
2718 | Mpi2SasIoUnitControlReply_t *mpi_reply = | 2719 | Mpi2SasIoUnitControlReply_t *mpi_reply = |
2719 | mpt2sas_base_get_reply_virt_addr(ioc, reply); | 2720 | mpt2sas_base_get_reply_virt_addr(ioc, reply); |
2720 | 2721 | #endif | |
2721 | dewtprintk(ioc, printk(MPT2SAS_INFO_FMT | 2722 | dewtprintk(ioc, printk(MPT2SAS_INFO_FMT |
2722 | "sc_complete:handle(0x%04x), (open) " | 2723 | "sc_complete:handle(0x%04x), (open) " |
2723 | "smid(%d), ioc_status(0x%04x), loginfo(0x%08x)\n", | 2724 | "smid(%d), ioc_status(0x%04x), loginfo(0x%08x)\n", |