Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[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 faf7f56f0fb30e5bc60fa87954d858cf3270ce34..c11cd193f8964ff1741453e309a85a0f6d5d4402 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;
@@ -164,9 +161,9 @@ struct afu {
 
        /* AFU HW */
        struct cxl_ioctl_start_work work;
-       struct cxlflash_afu_map *afu_map;       /* entire MMIO map */
-       struct sisl_host_map *host_map;         /* MC host map */
-       struct sisl_ctrl_map *ctrl_map;         /* MC control map */
+       struct cxlflash_afu_map __iomem *afu_map;       /* entire MMIO map */
+       struct sisl_host_map __iomem *host_map;         /* MC host map */
+       struct sisl_ctrl_map __iomem *ctrl_map;         /* MC control map */
 
        ctx_hndl_t ctx_hndl;    /* master's context handle */
        u64 *hrrq_start;
@@ -179,7 +176,7 @@ struct afu {
        u32 cmd_couts;          /* Number of command checkouts */
        u32 internal_lun;       /* User-desired LUN mode for this AFU */
 
-       char version[8];
+       char version[16];
        u64 interface_version;
 
        struct cxlflash_cfg *parent; /* Pointer back to parent cxlflash_cfg */
@@ -188,10 +185,10 @@ struct afu {
 
 static inline u64 lun_to_lunid(u64 lun)
 {
-       u64 lun_id;
+       __be64 lun_id;
 
        int_to_scsilun(lun, (struct scsi_lun *)&lun_id);
-       return swab64(lun_id);
+       return be64_to_cpu(lun_id);
 }
 
 int cxlflash_afu_sync(struct afu *, ctx_hndl_t, res_hndl_t, u8);