Skip to content

Commit

Permalink
scsi: cxlflash: Abstract hardware dependent assignments
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Uma Krishnan authored and Martin K. Petersen committed May 18, 2018
1 parent 5e12397 commit de5d35a
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 5 deletions.
7 changes: 2 additions & 5 deletions drivers/scsi/cxlflash/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3708,11 +3708,8 @@ static int cxlflash_probe(struct pci_dev *pdev,
cfg->init_state = INIT_STATE_NONE;
cfg->dev = pdev;
cfg->cxl_fops = cxlflash_cxl_fops;

if (ddv->flags & CXLFLASH_OCXL_DEV)
cfg->ops = &cxlflash_ocxl_ops;
else
cfg->ops = &cxlflash_cxl_ops;
cfg->ops = cxlflash_assign_ops(ddv);
WARN_ON_ONCE(!cfg->ops);

/*
* Promoted LUNs move to the top of the LUN table. The rest stay on
Expand Down
15 changes: 15 additions & 0 deletions drivers/scsi/cxlflash/main.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include <scsi/scsi.h>
#include <scsi/scsi_device.h>

#include "backend.h"

#define CXLFLASH_NAME "cxlflash"
#define CXLFLASH_ADAPTER_NAME "IBM POWER CXL Flash Adapter"
#define CXLFLASH_MAX_ADAPTERS 32
Expand Down Expand Up @@ -100,6 +102,19 @@ struct dev_dependent_vals {
#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 {
u64 status;
char *desc;
Expand Down

0 comments on commit de5d35a

Please sign in to comment.