Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

[firefly-linux-kernel-4.4.55.git] / drivers / scsi / cxlflash / common.h

diff --git a/drivers/scsi/cxlflash/common.h b/drivers/scsi/cxlflash/common.h
index a81058555d97f58bcca6c40d3a6d64a0a1fcc77d..5ada9268a450db224663f2fa28e43fc79701c886 100644 (file)
--- a/drivers/scsi/cxlflash/common.h
+++ b/drivers/scsi/cxlflash/common.h
@@ -21,6 +21,7 @@
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 
+extern const struct file_operations cxlflash_cxl_fops;
 
 #define MAX_CONTEXT  CXLFLASH_MAX_CONTEXT       /* num contexts per afu */
 
@@ -105,8 +106,6 @@ struct cxlflash_cfg {
        atomic_t scan_host_needed;
 
        struct cxl_afu *cxl_afu;
-
-       struct pci_pool *cxlflash_cmd_pool;
        struct pci_dev *parent_dev;
 
        atomic_t recovery_threads;
@@ -117,8 +116,6 @@ struct cxlflash_cfg {
        struct list_head ctx_err_recovery; /* contexts w/ recovery pending */
        struct file_operations cxl_fops;
 
-       atomic_t num_user_contexts;
-
        /* Parameters that are LUN table related */
        int last_lun_index[CXLFLASH_NUM_FC_PORTS];
        int promote_lun_index;
@@ -168,6 +165,8 @@ struct afu {
        struct sisl_host_map __iomem *host_map;         /* MC host map */
        struct sisl_ctrl_map __iomem *ctrl_map;         /* MC control map */
 
+       struct kref mapcount;
+
        ctx_hndl_t ctx_hndl;    /* master's context handle */
        u64 *hrrq_start;
        u64 *hrrq_end;