From: Andrew Donnellan Date: Mon, 18 Jul 2016 04:52:57 +0000 (+1000) Subject: cxl: remove dead Kconfig options X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1e44727a0b220f6ead12fefcff997354be0f0f02;p=linux-beck.git cxl: remove dead Kconfig options Remove the CXL_KERNEL_API and CXL_EEH Kconfig options, as they were only needed to coordinate the merging of the cxlflash driver. Also remove the stub implementation of cxl_perst_reloads_same_image() in cxlflash which is only used if CXL_EEH isn't defined (i.e. never). Suggested-by: Ian Munsie Signed-off-by: Andrew Donnellan Acked-by: Ian Munsie Acked-by: Matthew R. Ochs Signed-off-by: Michael Ellerman --- diff --git a/drivers/misc/cxl/Kconfig b/drivers/misc/cxl/Kconfig index 8d767705ec21..b75cf830d08a 100644 --- a/drivers/misc/cxl/Kconfig +++ b/drivers/misc/cxl/Kconfig @@ -7,14 +7,6 @@ config CXL_BASE default n select PPC_COPRO_BASE -config CXL_KERNEL_API - bool - default n - -config CXL_EEH - bool - default n - config CXL_AFU_DRIVER_OPS bool default n @@ -23,8 +15,6 @@ config CXL tristate "Support for IBM Coherent Accelerators (CXL)" depends on PPC_POWERNV && PCI_MSI && EEH select CXL_BASE - select CXL_KERNEL_API - select CXL_EEH select CXL_AFU_DRIVER_OPS default m help diff --git a/drivers/scsi/cxlflash/main.h b/drivers/scsi/cxlflash/main.h index eb9d8f730b38..a8934084154b 100644 --- a/drivers/scsi/cxlflash/main.h +++ b/drivers/scsi/cxlflash/main.h @@ -100,8 +100,4 @@ struct asyc_intr_info { #define SCAN_HOST 0x04 }; -#ifndef CONFIG_CXL_EEH -#define cxl_perst_reloads_same_image(_a, _b) do { } while (0) -#endif - #endif /* _CXLFLASH_MAIN_H */