| Message ID | 1467616334-20977-1-git-send-email-andrew.donnellan@au1.ibm.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
Acked-by: Ian Munsie <imunsie@au1.ibm.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On 04/07/16 17:12, Andrew Donnellan wrote: > 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 <imunsie@au1.ibm.com> > Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > > --- > > Applies on top of powerpc#next I'm going to rebase this on top of the current Mellanox CX-4 series shortly. Andrew
> On Jul 4, 2016, at 2:12 AM, Andrew Donnellan <andrew.donnellan@au1.ibm.com> wrote: > > 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 <imunsie@au1.ibm.com> > Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com> -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
>>>>> "Andrew" == Andrew Donnellan <andrew.donnellan@au1.ibm.com> writes:
Andrew> Remove the CXL_KERNEL_API and CXL_EEH Kconfig options, as they
Andrew> were only needed to coordinate the merging of the cxlflash
Andrew> driver. Also remove the stub implementation of
Andrew> cxl_perst_reloads_same_image() in cxlflash which is only used if
Andrew> CXL_EEH isn't defined (i.e. never).
This patch straddles a few subsystems. Did you intend for me to queue it
through SCSI?
On 14/07/16 12:02, Martin K. Petersen wrote: >>>>>> "Andrew" == Andrew Donnellan <andrew.donnellan@au1.ibm.com> writes: > > Andrew> Remove the CXL_KERNEL_API and CXL_EEH Kconfig options, as they > Andrew> were only needed to coordinate the merging of the cxlflash > Andrew> driver. Also remove the stub implementation of > Andrew> cxl_perst_reloads_same_image() in cxlflash which is only used if > Andrew> CXL_EEH isn't defined (i.e. never). > > This patch straddles a few subsystems. Did you intend for me to queue it > through SCSI? Sorry for not stating explicitly - I'd like this taken through powerpc as the cxlflash change is incidental to the cxl changes.
On 14/07/16 12:05, Andrew Donnellan wrote: > Sorry for not stating explicitly - I'd like this taken through powerpc > as the cxlflash change is incidental to the cxl changes. I'll also be submitting a v2 that applies on top of another cxl series that hasn't been merged yet.
>>>>> "Andrew" == Andrew Donnellan <andrew.donnellan@au1.ibm.com> writes: >> This patch straddles a few subsystems. Did you intend for me to queue >> it through SCSI? Andrew> Sorry for not stating explicitly - I'd like this taken through Andrew> powerpc as the cxlflash change is incidental to the cxl changes. No problem.
diff --git a/drivers/misc/cxl/Kconfig b/drivers/misc/cxl/Kconfig index 560412c..0cb10cf 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 eb9d8f7..a893408 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 */
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 <imunsie@au1.ibm.com> Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> --- Applies on top of powerpc#next --- drivers/misc/cxl/Kconfig | 10 ---------- drivers/scsi/cxlflash/main.h | 4 ---- 2 files changed, 14 deletions(-)