diff options
author | 2015-11-25 10:56:40 -0800 | |
---|---|---|
committer | 2015-11-25 10:56:40 -0800 | |
commit | 970259bff472579204108c6f27036ec4d1206ae1 (patch) | |
tree | 869bdcda9aac4c67712d93e6141056fdf3f41bd8 /drivers/scsi/mpt3sas/mpt3sas_debug.h | |
parent | ARM: OMAP2+: remove custom abort handler for t410 (diff) | |
parent | arm: omap2+: add missing HWMOD_NO_IDLEST in 81xx hwmod data (diff) | |
download | linux-dev-970259bff472579204108c6f27036ec4d1206ae1.tar.xz linux-dev-970259bff472579204108c6f27036ec4d1206ae1.zip |
Merge branch '81xx' into omap-for-v4.4/fixes
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_debug.h')
-rw-r--r-- | drivers/scsi/mpt3sas/mpt3sas_debug.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_debug.h b/drivers/scsi/mpt3sas/mpt3sas_debug.h index 4e8a63fdb304..cceeb2c16e64 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_debug.h +++ b/drivers/scsi/mpt3sas/mpt3sas_debug.h @@ -68,20 +68,11 @@ #define MPT_DEBUG_TRIGGER_DIAG 0x00200000 -/* - * CONFIG_SCSI_MPT3SAS_LOGGING - enabled in Kconfig - */ - -#ifdef CONFIG_SCSI_MPT3SAS_LOGGING #define MPT_CHECK_LOGGING(IOC, CMD, BITS) \ { \ if (IOC->logging_level & BITS) \ CMD; \ } -#else -#define MPT_CHECK_LOGGING(IOC, CMD, BITS) -#endif /* CONFIG_SCSI_MPT3SAS_LOGGING */ - /* * debug macros @@ -153,7 +144,7 @@ /* inline functions for dumping debug data*/ -#ifdef CONFIG_SCSI_MPT3SAS_LOGGING + /** * _debug_dump_mf - print message frame contents * @mpi_request: pointer to message frame @@ -211,10 +202,5 @@ _debug_dump_config(void *mpi_request, int sz) } pr_info("\n"); } -#else -#define _debug_dump_mf(mpi_request, sz) -#define _debug_dump_reply(mpi_request, sz) -#define _debug_dump_config(mpi_request, sz) -#endif /* CONFIG_SCSI_MPT3SAS_LOGGING */ #endif /* MPT3SAS_DEBUG_H_INCLUDED */ |