AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-02-17 04:17:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

scsi: cxlflash: Abstract hardware dependent assignments

Browse Source 
As a staging cleanup to support transport specific builds of the cxlflash
module, relocate device dependent assignments to header files. This will
avoid littering the core driver with conditional compilation logic.

Signed-off-by: Uma Krishnan <ukrishn@linux.vnet.ibm.com>
Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Uma Krishnan 2018-05-11 14:06:05 -05:00 committed by Martin K. Petersen
parent 5e12397a97
commit de5d35aff5
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/cxlflash/main.c
View File

@ -3708,11 +3708,8 @@ static int cxlflash_probe(struct pci_dev *pdev,
cfg->init_state = INIT_STATE_NONE; cfg->init_state = INIT_STATE_NONE;
cfg->dev = pdev; cfg->dev = pdev;
cfg->cxl_fops = cxlflash_cxl_fops; cfg->cxl_fops = cxlflash_cxl_fops;
cfg->ops = cxlflash_assign_ops(ddv);
if (ddv->flags & CXLFLASH_OCXL_DEV) WARN_ON_ONCE(!cfg->ops);
cfg->ops = &cxlflash_ocxl_ops;
else
cfg->ops = &cxlflash_cxl_ops;
/* /*
* Promoted LUNs move to the top of the LUN table. The rest stay on * Promoted LUNs move to the top of the LUN table. The rest stay on

15
drivers/scsi/cxlflash/main.h
View File

@ -20,6 +20,8 @@
#include <scsi/scsi.h> #include <scsi/scsi.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
#include "backend.h"
#define CXLFLASH_NAME "cxlflash" #define CXLFLASH_NAME "cxlflash"
#define CXLFLASH_ADAPTER_NAME "IBM POWER CXL Flash Adapter" #define CXLFLASH_ADAPTER_NAME "IBM POWER CXL Flash Adapter"
#define CXLFLASH_MAX_ADAPTERS 32 #define CXLFLASH_MAX_ADAPTERS 32
@ -100,6 +102,19 @@ struct dev_dependent_vals {
#define CXLFLASH_OCXL_DEV 0x0000000000000004ULL #define CXLFLASH_OCXL_DEV 0x0000000000000004ULL
}; };
static inline const struct cxlflash_backend_ops *
cxlflash_assign_ops(struct dev_dependent_vals *ddv)
{
const struct cxlflash_backend_ops *ops = NULL;
if (ddv->flags & CXLFLASH_OCXL_DEV)
ops = &cxlflash_ocxl_ops;
if (!(ddv->flags & CXLFLASH_OCXL_DEV))
ops = &cxlflash_cxl_ops;
return ops;
}
struct asyc_intr_info { struct asyc_intr_info {
u64 status; u64 status;
char *desc; char *desc;