*/
 static struct llun_info *create_local(struct scsi_device *sdev, u8 *wwid)
 {
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = NULL;
 
        lli = kzalloc(sizeof(*lli), GFP_KERNEL);
        if (unlikely(!lli)) {
-               pr_err("%s: could not allocate lli\n", __func__);
+               dev_err(dev, "%s: could not allocate lli\n", __func__);
                goto out;
        }
 
  */
 static struct glun_info *create_global(struct scsi_device *sdev, u8 *wwid)
 {
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct glun_info *gli = NULL;
 
        gli = kzalloc(sizeof(*gli), GFP_KERNEL);
        if (unlikely(!gli)) {
-               pr_err("%s: could not allocate gli\n", __func__);
+               dev_err(dev, "%s: could not allocate gli\n", __func__);
                goto out;
        }
 
  */
 static struct llun_info *find_and_create_lun(struct scsi_device *sdev, u8 *wwid)
 {
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = NULL;
        struct glun_info *gli = NULL;
-       struct Scsi_Host *shost = sdev->host;
-       struct cxlflash_cfg *cfg = shost_priv(shost);
 
        if (unlikely(!wwid))
                goto out;
        list_add(&gli->list, &global.gluns);
 
 out:
-       pr_debug("%s: returning %p\n", __func__, lli);
+       dev_dbg(dev, "%s: returning lli=%p, gli=%p\n", __func__, lli, gli);
        return lli;
 }
 
 int cxlflash_manage_lun(struct scsi_device *sdev,
                        struct dk_cxlflash_manage_lun *manage)
 {
-       int rc = 0;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = NULL;
+       int rc = 0;
        u64 flags = manage->hdr.flags;
        u32 chan = sdev->channel;
 
        mutex_lock(&global.mutex);
        lli = find_and_create_lun(sdev, manage->wwid);
-       pr_debug("%s: ENTER: WWID = %016llX%016llX, flags = %016llX li = %p\n",
-                __func__, get_unaligned_be64(&manage->wwid[0]),
-                get_unaligned_be64(&manage->wwid[8]),
-                manage->hdr.flags, lli);
+       dev_dbg(dev, "%s: WWID=%016llx%016llx, flags=%016llx lli=%p\n",
+               __func__, get_unaligned_be64(&manage->wwid[0]),
+               get_unaligned_be64(&manage->wwid[8]), manage->hdr.flags, lli);
        if (unlikely(!lli)) {
                rc = -ENOMEM;
                goto out;
                }
        }
 
-       pr_debug("%s: port_sel = %08X chan = %u lun_id = %016llX\n", __func__,
-                lli->port_sel, chan, lli->lun_id[chan]);
+       dev_dbg(dev, "%s: port_sel=%08x chan=%u lun_id=%016llx\n",
+               __func__, lli->port_sel, chan, lli->lun_id[chan]);
 
 out:
        mutex_unlock(&global.mutex);
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
  */
 static void process_cmd_err(struct afu_cmd *cmd, struct scsi_cmnd *scp)
 {
+       struct afu *afu = cmd->parent;
+       struct cxlflash_cfg *cfg = afu->parent;
+       struct device *dev = &cfg->dev->dev;
        struct sisl_ioarcb *ioarcb;
        struct sisl_ioasa *ioasa;
        u32 resid;
        if (ioasa->rc.flags & SISL_RC_FLAGS_UNDERRUN) {
                resid = ioasa->resid;
                scsi_set_resid(scp, resid);
-               pr_debug("%s: cmd underrun cmd = %p scp = %p, resid = %d\n",
-                        __func__, cmd, scp, resid);
+               dev_dbg(dev, "%s: cmd underrun cmd = %p scp = %p, resid = %d\n",
+                       __func__, cmd, scp, resid);
        }
 
        if (ioasa->rc.flags & SISL_RC_FLAGS_OVERRUN) {
-               pr_debug("%s: cmd underrun cmd = %p scp = %p\n",
-                        __func__, cmd, scp);
+               dev_dbg(dev, "%s: cmd underrun cmd = %p scp = %p\n",
+                       __func__, cmd, scp);
                scp->result = (DID_ERROR << 16);
        }
 
-       pr_debug("%s: cmd failed afu_rc=%d scsi_rc=%d fc_rc=%d "
-                "afu_extra=0x%X, scsi_extra=0x%X, fc_extra=0x%X\n",
-                __func__, ioasa->rc.afu_rc, ioasa->rc.scsi_rc,
-                ioasa->rc.fc_rc, ioasa->afu_extra, ioasa->scsi_extra,
-                ioasa->fc_extra);
+       dev_dbg(dev, "%s: cmd failed afu_rc=%02x scsi_rc=%02x fc_rc=%02x "
+               "afu_extra=%02x scsi_extra=%02x fc_extra=%02x\n", __func__,
+               ioasa->rc.afu_rc, ioasa->rc.scsi_rc, ioasa->rc.fc_rc,
+               ioasa->afu_extra, ioasa->scsi_extra, ioasa->fc_extra);
 
        if (ioasa->rc.scsi_rc) {
                /* We have a SCSI status */
        ulong lock_flags;
        struct afu *afu = cmd->parent;
        struct cxlflash_cfg *cfg = afu->parent;
+       struct device *dev = &cfg->dev->dev;
        bool cmd_is_tmf;
 
        if (cmd->scp) {
 
                cmd_is_tmf = cmd->cmd_tmf;
 
-               pr_debug_ratelimited("%s: calling scsi_done scp=%p result=%X "
-                                    "ioasc=%d\n", __func__, scp, scp->result,
-                                    cmd->sa.ioasc);
+               dev_dbg_ratelimited(dev, "%s:scp=%p result=%08x ioasc=%08x\n",
+                                   __func__, scp, scp->result, cmd->sa.ioasc);
 
                scsi_dma_unmap(scp);
                scp->scsi_done(scp);
        struct cxlflash_cfg *cfg = afu->parent;
        struct device *dev = &cfg->dev->dev;
 
-       pr_debug("%s: cmd=%p\n", __func__, cmd);
+       dev_dbg(dev, "%s: cmd=%p\n", __func__, cmd);
 
        writeq_be(rrin, reset_reg);
        do {
                udelay(1 << nretry);
        } while (nretry++ < MC_ROOM_RETRY_CNT);
 
-       dev_dbg(dev, "%s: returning rrin=0x%016llX nretry=%d\n",
+       dev_dbg(dev, "%s: returning rrin=%016llx nretry=%d\n",
                __func__, rrin, nretry);
 }
 
        writeq_be((u64)&cmd->rcb, &afu->host_map->ioarrin);
 out:
        spin_unlock_irqrestore(&afu->rrin_slock, lock_flags);
-       pr_devel("%s: cmd=%p len=%d ea=%p rc=%d\n", __func__, cmd,
-                cmd->rcb.data_len, (void *)cmd->rcb.data_ea, rc);
+       dev_dbg(dev, "%s: cmd=%p len=%u ea=%016llx rc=%d\n", __func__,
+               cmd, cmd->rcb.data_len, cmd->rcb.data_ea, rc);
        return rc;
 }
 
 
        spin_unlock_irqrestore(&afu->hsq_slock, lock_flags);
 out:
-       dev_dbg(dev, "%s: cmd=%p len=%d ea=%p ioasa=%p rc=%d curr=%p "
-              "head=%016llX tail=%016llX\n", __func__, cmd, cmd->rcb.data_len,
-              (void *)cmd->rcb.data_ea, cmd->rcb.ioasa, rc, afu->hsq_curr,
+       dev_dbg(dev, "%s: cmd=%p len=%u ea=%016llx ioasa=%p rc=%d curr=%p "
+              "head=%016llx tail=%016llx\n", __func__, cmd, cmd->rcb.data_len,
+              cmd->rcb.data_ea, cmd->rcb.ioasa, rc, afu->hsq_curr,
               readq_be(&afu->host_map->sq_head),
               readq_be(&afu->host_map->sq_tail));
        return rc;
  */
 static int wait_resp(struct afu *afu, struct afu_cmd *cmd)
 {
+       struct cxlflash_cfg *cfg = afu->parent;
+       struct device *dev = &cfg->dev->dev;
        int rc = 0;
        ulong timeout = msecs_to_jiffies(cmd->rcb.timeout * 2 * 1000);
 
        }
 
        if (unlikely(cmd->sa.ioasc != 0)) {
-               pr_err("%s: CMD 0x%X failed, IOASC: flags 0x%X, afu_rc 0x%X, "
-                      "scsi_rc 0x%X, fc_rc 0x%X\n", __func__, cmd->rcb.cdb[0],
-                      cmd->sa.rc.flags, cmd->sa.rc.afu_rc, cmd->sa.rc.scsi_rc,
-                      cmd->sa.rc.fc_rc);
+               dev_err(dev, "%s: cmd %02x failed, ioasc=%08x\n",
+                       __func__, cmd->rcb.cdb[0], cmd->sa.ioasc);
                rc = -1;
        }
 
 static int send_tmf(struct afu *afu, struct scsi_cmnd *scp, u64 tmfcmd)
 {
        u32 port_sel = scp->device->channel + 1;
-       struct Scsi_Host *host = scp->device->host;
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(scp->device->host);
        struct afu_cmd *cmd = sc_to_afucz(scp);
        struct device *dev = &cfg->dev->dev;
        ulong lock_flags;
                                                       to);
        if (!to) {
                cfg->tmf_active = false;
-               dev_err(dev, "%s: TMF timed out!\n", __func__);
+               dev_err(dev, "%s: TMF timed out\n", __func__);
                rc = -1;
        }
        spin_unlock_irqrestore(&cfg->tmf_slock, lock_flags);
  */
 static int cxlflash_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scp)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(host);
        struct afu *afu = cfg->afu;
        struct device *dev = &cfg->dev->dev;
        struct afu_cmd *cmd = sc_to_afucz(scp);
        int kref_got = 0;
 
        dev_dbg_ratelimited(dev, "%s: (scp=%p) %d/%d/%d/%llu "
-                           "cdb=(%08X-%08X-%08X-%08X)\n",
+                           "cdb=(%08x-%08x-%08x-%08x)\n",
                            __func__, scp, host->host_no, scp->device->channel,
                            scp->device->id, scp->device->lun,
                            get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
 
        switch (cfg->state) {
        case STATE_RESET:
-               dev_dbg_ratelimited(dev, "%s: device is in reset!\n", __func__);
+               dev_dbg_ratelimited(dev, "%s: device is in reset\n", __func__);
                rc = SCSI_MLQUEUE_HOST_BUSY;
                goto out;
        case STATE_FAILTERM:
-               dev_dbg_ratelimited(dev, "%s: device has failed!\n", __func__);
+               dev_dbg_ratelimited(dev, "%s: device has failed\n", __func__);
                scp->result = (DID_NO_CONNECT << 16);
                scp->scsi_done(scp);
                rc = 0;
        if (likely(sg)) {
                nseg = scsi_dma_map(scp);
                if (unlikely(nseg < 0)) {
-                       dev_err(dev, "%s: Fail DMA map!\n", __func__);
+                       dev_err(dev, "%s: Fail DMA map\n", __func__);
                        rc = SCSI_MLQUEUE_HOST_BUSY;
                        goto out;
                }
 out:
        if (kref_got)
                kref_put(&afu->mapcount, afu_unmap);
-       pr_devel("%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
  */
 static void term_afu(struct cxlflash_cfg *cfg)
 {
+       struct device *dev = &cfg->dev->dev;
+
        /*
         * Tear down is carefully orchestrated to ensure
         * no interrupts can come in when the problem state
 
        term_mc(cfg);
 
-       pr_debug("%s: returning\n", __func__);
+       dev_dbg(dev, "%s: returning\n", __func__);
 }
 
 /**
                return;
 
        if (!afu || !afu->afu_map) {
-               dev_dbg(dev, "%s: The problem state area is not mapped\n",
-                       __func__);
+               dev_dbg(dev, "%s: Problem state area not mapped\n", __func__);
                return;
        }
 
 static void cxlflash_remove(struct pci_dev *pdev)
 {
        struct cxlflash_cfg *cfg = pci_get_drvdata(pdev);
+       struct device *dev = &pdev->dev;
        ulong lock_flags;
 
        if (!pci_is_enabled(pdev)) {
-               pr_debug("%s: Device is disabled\n", __func__);
+               dev_dbg(dev, "%s: Device is disabled\n", __func__);
                return;
        }
 
                break;
        }
 
-       pr_debug("%s: returning\n", __func__);
+       dev_dbg(dev, "%s: returning\n", __func__);
 }
 
 /**
 static int init_pci(struct cxlflash_cfg *cfg)
 {
        struct pci_dev *pdev = cfg->dev;
+       struct device *dev = &cfg->dev->dev;
        int rc = 0;
 
        rc = pci_enable_device(pdev);
                }
 
                if (rc) {
-                       dev_err(&pdev->dev, "%s: Cannot enable adapter\n",
-                               __func__);
+                       dev_err(dev, "%s: Cannot enable adapter\n", __func__);
                        cxlflash_wait_for_pci_err_recovery(cfg);
                        goto out;
                }
        }
 
 out:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
 static int init_scsi(struct cxlflash_cfg *cfg)
 {
        struct pci_dev *pdev = cfg->dev;
+       struct device *dev = &cfg->dev->dev;
        int rc = 0;
 
        rc = scsi_add_host(cfg->host, &pdev->dev);
        if (rc) {
-               dev_err(&pdev->dev, "%s: scsi_add_host failed (rc=%d)\n",
-                       __func__, rc);
+               dev_err(dev, "%s: scsi_add_host failed rc=%d\n", __func__, rc);
                goto out;
        }
 
        scsi_scan_host(cfg->host);
 
 out:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
  * Return:
  *     TRUE (1) when the specified port is online
  *     FALSE (0) when the specified port fails to come online after timeout
- *     -EINVAL when @delay_us is less than 1000
  */
-static int wait_port_online(__be64 __iomem *fc_regs, u32 delay_us, u32 nretry)
+static bool wait_port_online(__be64 __iomem *fc_regs, u32 delay_us, u32 nretry)
 {
        u64 status;
 
-       if (delay_us < 1000) {
-               pr_err("%s: invalid delay specified %d\n", __func__, delay_us);
-               return -EINVAL;
-       }
+       WARN_ON(delay_us < 1000);
 
        do {
                msleep(delay_us / 1000);
  * Return:
  *     TRUE (1) when the specified port is offline
  *     FALSE (0) when the specified port fails to go offline after timeout
- *     -EINVAL when @delay_us is less than 1000
  */
-static int wait_port_offline(__be64 __iomem *fc_regs, u32 delay_us, u32 nretry)
+static bool wait_port_offline(__be64 __iomem *fc_regs, u32 delay_us, u32 nretry)
 {
        u64 status;
 
-       if (delay_us < 1000) {
-               pr_err("%s: invalid delay specified %d\n", __func__, delay_us);
-               return -EINVAL;
-       }
+       WARN_ON(delay_us < 1000);
 
        do {
                msleep(delay_us / 1000);
 static void afu_set_wwpn(struct afu *afu, int port, __be64 __iomem *fc_regs,
                         u64 wwpn)
 {
+       struct cxlflash_cfg *cfg = afu->parent;
+       struct device *dev = &cfg->dev->dev;
+
        set_port_offline(fc_regs);
        if (!wait_port_offline(fc_regs, FC_PORT_STATUS_RETRY_INTERVAL_US,
                               FC_PORT_STATUS_RETRY_CNT)) {
-               pr_debug("%s: wait on port %d to go offline timed out\n",
-                        __func__, port);
+               dev_dbg(dev, "%s: wait on port %d to go offline timed out\n",
+                       __func__, port);
        }
 
        writeq_be(wwpn, &fc_regs[FC_PNAME / 8]);
        set_port_online(fc_regs);
        if (!wait_port_online(fc_regs, FC_PORT_STATUS_RETRY_INTERVAL_US,
                              FC_PORT_STATUS_RETRY_CNT)) {
-               pr_debug("%s: wait on port %d to go online timed out\n",
-                        __func__, port);
+               dev_dbg(dev, "%s: wait on port %d to go online timed out\n",
+                       __func__, port);
        }
 }
 
  */
 static void afu_link_reset(struct afu *afu, int port, __be64 __iomem *fc_regs)
 {
+       struct cxlflash_cfg *cfg = afu->parent;
+       struct device *dev = &cfg->dev->dev;
        u64 port_sel;
 
        /* first switch the AFU to the other links, if any */
        set_port_offline(fc_regs);
        if (!wait_port_offline(fc_regs, FC_PORT_STATUS_RETRY_INTERVAL_US,
                               FC_PORT_STATUS_RETRY_CNT))
-               pr_err("%s: wait on port %d to go offline timed out\n",
-                      __func__, port);
+               dev_err(dev, "%s: wait on port %d to go offline timed out\n",
+                       __func__, port);
 
        set_port_online(fc_regs);
        if (!wait_port_online(fc_regs, FC_PORT_STATUS_RETRY_INTERVAL_US,
                              FC_PORT_STATUS_RETRY_CNT))
-               pr_err("%s: wait on port %d to go online timed out\n",
-                      __func__, port);
+               dev_err(dev, "%s: wait on port %d to go online timed out\n",
+                       __func__, port);
 
        /* switch back to include this port */
        port_sel |= (1ULL << port);
        writeq_be(port_sel, &afu->afu_map->global.regs.afu_port_sel);
        cxlflash_afu_sync(afu, 0, 0, AFU_GSYNC);
 
-       pr_debug("%s: returning port_sel=%lld\n", __func__, port_sel);
+       dev_dbg(dev, "%s: returning port_sel=%016llx\n", __func__, port_sel);
 }
 
 /*
 static irqreturn_t cxlflash_sync_err_irq(int irq, void *data)
 {
        struct afu *afu = (struct afu *)data;
+       struct cxlflash_cfg *cfg = afu->parent;
+       struct device *dev = &cfg->dev->dev;
        u64 reg;
        u64 reg_unmasked;
 
        reg_unmasked = (reg & SISL_ISTATUS_UNMASK);
 
        if (reg_unmasked == 0UL) {
-               pr_err("%s: %llX: spurious interrupt, intr_status %016llX\n",
-                      __func__, (u64)afu, reg);
+               dev_err(dev, "%s: spurious interrupt, intr_status=%016llx\n",
+                       __func__, reg);
                goto cxlflash_sync_err_irq_exit;
        }
 
-       pr_err("%s: %llX: unexpected interrupt, intr_status %016llX\n",
-              __func__, (u64)afu, reg);
+       dev_err(dev, "%s: unexpected interrupt, intr_status=%016llx\n",
+               __func__, reg);
 
        writeq_be(reg_unmasked, &afu->host_map->intr_clear);
 
 cxlflash_sync_err_irq_exit:
-       pr_debug("%s: returning rc=%d\n", __func__, IRQ_HANDLED);
        return IRQ_HANDLED;
 }
 
        reg_unmasked = (reg & SISL_ASTATUS_UNMASK);
 
        if (reg_unmasked == 0) {
-               dev_err(dev, "%s: spurious interrupt, aintr_status 0x%016llX\n",
+               dev_err(dev, "%s: spurious interrupt, aintr_status=%016llx\n",
                        __func__, reg);
                goto out;
        }
 
                port = info->port;
 
-               dev_err(dev, "%s: FC Port %d -> %s, fc_status 0x%08llX\n",
+               dev_err(dev, "%s: FC Port %d -> %s, fc_status=%016llx\n",
                        __func__, port, info->desc,
                       readq_be(&global->fc_regs[port][FC_STATUS / 8]));
 
                         * should be the same and tracing one is sufficient.
                         */
 
-                       dev_err(dev, "%s: fc %d: clearing fc_error 0x%08llX\n",
+                       dev_err(dev, "%s: fc %d: clearing fc_error=%016llx\n",
                                __func__, port, reg);
 
                        writeq_be(reg, &global->fc_regs[port][FC_ERROR / 8]);
        }
 
 out:
-       dev_dbg(dev, "%s: returning IRQ_HANDLED, afu=%p\n", __func__, afu);
        return IRQ_HANDLED;
 }
 
  */
 static int start_context(struct cxlflash_cfg *cfg)
 {
+       struct device *dev = &cfg->dev->dev;
        int rc = 0;
 
        rc = cxl_start_context(cfg->mcctx,
                               cfg->afu->work.work_element_descriptor,
                               NULL);
 
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
  */
 static int read_vpd(struct cxlflash_cfg *cfg, u64 wwpn[])
 {
-       struct pci_dev *dev = cfg->dev;
+       struct device *dev = &cfg->dev->dev;
+       struct pci_dev *pdev = cfg->dev;
        int rc = 0;
        int ro_start, ro_size, i, j, k;
        ssize_t vpd_size;
        char *wwpn_vpd_tags[NUM_FC_PORTS] = { "V5", "V6" };
 
        /* Get the VPD data from the device */
-       vpd_size = cxl_read_adapter_vpd(dev, vpd_data, sizeof(vpd_data));
+       vpd_size = cxl_read_adapter_vpd(pdev, vpd_data, sizeof(vpd_data));
        if (unlikely(vpd_size <= 0)) {
-               dev_err(&dev->dev, "%s: Unable to read VPD (size = %ld)\n",
-                      __func__, vpd_size);
+               dev_err(dev, "%s: Unable to read VPD (size = %ld)\n",
+                       __func__, vpd_size);
                rc = -ENODEV;
                goto out;
        }
        ro_start = pci_vpd_find_tag(vpd_data, 0, vpd_size,
                                    PCI_VPD_LRDT_RO_DATA);
        if (unlikely(ro_start < 0)) {
-               dev_err(&dev->dev, "%s: VPD Read-only data not found\n",
-                       __func__);
+               dev_err(dev, "%s: VPD Read-only data not found\n", __func__);
                rc = -ENODEV;
                goto out;
        }
        j = ro_size;
        i = ro_start + PCI_VPD_LRDT_TAG_SIZE;
        if (unlikely((i + j) > vpd_size)) {
-               pr_debug("%s: Might need to read more VPD (%d > %ld)\n",
-                        __func__, (i + j), vpd_size);
+               dev_dbg(dev, "%s: Might need to read more VPD (%d > %ld)\n",
+                       __func__, (i + j), vpd_size);
                ro_size = vpd_size - i;
        }
 
 
                i = pci_vpd_find_info_keyword(vpd_data, i, j, wwpn_vpd_tags[k]);
                if (unlikely(i < 0)) {
-                       dev_err(&dev->dev, "%s: Port %d WWPN not found "
-                               "in VPD\n", __func__, k);
+                       dev_err(dev, "%s: Port %d WWPN not found in VPD\n",
+                               __func__, k);
                        rc = -ENODEV;
                        goto out;
                }
                j = pci_vpd_info_field_size(&vpd_data[i]);
                i += PCI_VPD_INFO_FLD_HDR_SIZE;
                if (unlikely((i + j > vpd_size) || (j != WWPN_LEN))) {
-                       dev_err(&dev->dev, "%s: Port %d WWPN incomplete or "
-                               "VPD corrupt\n",
-                              __func__, k);
+                       dev_err(dev, "%s: Port %d WWPN incomplete or bad VPD\n",
+                               __func__, k);
                        rc = -ENODEV;
                        goto out;
                }
                memcpy(tmp_buf, &vpd_data[i], WWPN_LEN);
                rc = kstrtoul(tmp_buf, WWPN_LEN, (ulong *)&wwpn[k]);
                if (unlikely(rc)) {
-                       dev_err(&dev->dev, "%s: Fail to convert port %d WWPN "
-                               "to integer\n", __func__, k);
+                       dev_err(dev, "%s: WWPN conversion failed for port %d\n",
+                               __func__, k);
                        rc = -ENODEV;
                        goto out;
                }
        }
 
 out:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
                goto out;
        }
 
-       pr_debug("%s: wwpn0=0x%llX wwpn1=0x%llX\n", __func__, wwpn[0], wwpn[1]);
+       dev_dbg(dev, "%s: wwpn0=%016llx wwpn1=%016llx\n",
+               __func__, wwpn[0], wwpn[1]);
 
        /* Set up RRQ and SQ in AFU for master issued cmds */
        writeq_be((u64) afu->hrrq_start, &afu->host_map->rrq_start);
                  &afu->ctrl_map->ctx_cap);
        /* Initialize heartbeat */
        afu->hb = readq_be(&afu->afu_map->global.regs.afu_hb);
-
 out:
        return rc;
 }
 static int start_afu(struct cxlflash_cfg *cfg)
 {
        struct afu *afu = cfg->afu;
+       struct device *dev = &cfg->dev->dev;
        int rc = 0;
 
        init_pcr(cfg);
 
        rc = init_global(cfg);
 
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
 
        rc = cxl_allocate_afu_irqs(ctx, 3);
        if (unlikely(rc)) {
-               dev_err(dev, "%s: call to allocate_afu_irqs failed rc=%d!\n",
+               dev_err(dev, "%s: allocate_afu_irqs failed rc=%d\n",
                        __func__, rc);
                level = UNDO_NOOP;
                goto out;
        rc = cxl_map_afu_irq(ctx, 1, cxlflash_sync_err_irq, afu,
                             "SISL_MSI_SYNC_ERROR");
        if (unlikely(rc <= 0)) {
-               dev_err(dev, "%s: IRQ 1 (SISL_MSI_SYNC_ERROR) map failed!\n",
-                       __func__);
+               dev_err(dev, "%s: SISL_MSI_SYNC_ERROR map failed\n", __func__);
                level = FREE_IRQ;
                goto out;
        }
        rc = cxl_map_afu_irq(ctx, 2, cxlflash_rrq_irq, afu,
                             "SISL_MSI_RRQ_UPDATED");
        if (unlikely(rc <= 0)) {
-               dev_err(dev, "%s: IRQ 2 (SISL_MSI_RRQ_UPDATED) map failed!\n",
-                       __func__);
+               dev_err(dev, "%s: SISL_MSI_RRQ_UPDATED map failed\n", __func__);
                level = UNMAP_ONE;
                goto out;
        }
        rc = cxl_map_afu_irq(ctx, 3, cxlflash_async_err_irq, afu,
                             "SISL_MSI_ASYNC_ERROR");
        if (unlikely(rc <= 0)) {
-               dev_err(dev, "%s: IRQ 3 (SISL_MSI_ASYNC_ERROR) map failed!\n",
-                       __func__);
+               dev_err(dev, "%s: SISL_MSI_ASYNC_ERROR map failed\n", __func__);
                level = UNMAP_TWO;
                goto out;
        }
        /* During initialization reset the AFU to start from a clean slate */
        rc = cxl_afu_reset(cfg->mcctx);
        if (unlikely(rc)) {
-               dev_err(dev, "%s: initial AFU reset failed rc=%d\n",
-                       __func__, rc);
+               dev_err(dev, "%s: AFU reset failed rc=%d\n", __func__, rc);
                goto ret;
        }
 
        level = init_intr(cfg, ctx);
        if (unlikely(level)) {
-               dev_err(dev, "%s: setting up interrupts failed rc=%d\n",
-                       __func__, rc);
+               dev_err(dev, "%s: interrupt init failed rc=%d\n", __func__, rc);
                goto out;
        }
 
                goto out;
        }
 ret:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 out:
        term_intr(cfg, level);
 
        rc = init_mc(cfg);
        if (rc) {
-               dev_err(dev, "%s: call to init_mc failed, rc=%d!\n",
+               dev_err(dev, "%s: init_mc failed rc=%d\n",
                        __func__, rc);
                goto out;
        }
        /* Map the entire MMIO space of the AFU */
        afu->afu_map = cxl_psa_map(cfg->mcctx);
        if (!afu->afu_map) {
-               dev_err(dev, "%s: call to cxl_psa_map failed!\n", __func__);
+               dev_err(dev, "%s: cxl_psa_map failed\n", __func__);
                rc = -ENOMEM;
                goto err1;
        }
        afu->interface_version =
            readq_be(&afu->afu_map->global.regs.interface_version);
        if ((afu->interface_version + 1) == 0) {
-               pr_err("Back level AFU, please upgrade. AFU version %s "
-                      "interface version 0x%llx\n", afu->version,
+               dev_err(dev, "Back level AFU, please upgrade. AFU version %s "
+                       "interface version %016llx\n", afu->version,
                       afu->interface_version);
                rc = -EINVAL;
                goto err2;
                afu->context_reset = context_reset_ioarrin;
        }
 
-       pr_debug("%s: afu version %s, interface version 0x%llX\n", __func__,
-                afu->version, afu->interface_version);
+       dev_dbg(dev, "%s: afu_ver=%s interface_ver=%016llx\n", __func__,
+               afu->version, afu->interface_version);
 
        rc = start_afu(cfg);
        if (rc) {
-               dev_err(dev, "%s: call to start_afu failed, rc=%d!\n",
-                       __func__, rc);
+               dev_err(dev, "%s: start_afu failed, rc=%d\n", __func__, rc);
                goto err2;
        }
 
        /* Restore the LUN mappings */
        cxlflash_restore_luntable(cfg);
 out:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 
 err2:
        static DEFINE_MUTEX(sync_active);
 
        if (cfg->state != STATE_NORMAL) {
-               pr_debug("%s: Sync not required! (%u)\n", __func__, cfg->state);
+               dev_dbg(dev, "%s: Sync not required state=%u\n",
+                       __func__, cfg->state);
                return 0;
        }
 
        init_completion(&cmd->cevent);
        cmd->parent = afu;
 
-       pr_debug("%s: afu=%p cmd=%p %d\n", __func__, afu, cmd, ctx_hndl_u);
+       dev_dbg(dev, "%s: afu=%p cmd=%p %d\n", __func__, afu, cmd, ctx_hndl_u);
 
        cmd->rcb.req_flags = SISL_REQ_FLAGS_AFU_CMD;
        cmd->rcb.ctx_id = afu->ctx_hndl;
        atomic_dec(&afu->cmds_active);
        mutex_unlock(&sync_active);
        kfree(buf);
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
  */
 static int afu_reset(struct cxlflash_cfg *cfg)
 {
+       struct device *dev = &cfg->dev->dev;
        int rc = 0;
+
        /* Stop the context before the reset. Since the context is
         * no longer available restart it after the reset is complete
         */
-
        term_afu(cfg);
 
        rc = init_afu(cfg);
 
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
 {
        int rc = SUCCESS;
        struct Scsi_Host *host = scp->device->host;
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(host);
+       struct device *dev = &cfg->dev->dev;
        struct afu *afu = cfg->afu;
        int rcr = 0;
 
-       pr_debug("%s: (scp=%p) %d/%d/%d/%llu "
-                "cdb=(%08X-%08X-%08X-%08X)\n", __func__, scp,
-                host->host_no, scp->device->channel,
-                scp->device->id, scp->device->lun,
-                get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
-                get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
-                get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
-                get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
+       dev_dbg(dev, "%s: (scp=%p) %d/%d/%d/%llu "
+               "cdb=(%08x-%08x-%08x-%08x)\n", __func__, scp, host->host_no,
+               scp->device->channel, scp->device->id, scp->device->lun,
+               get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
+               get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
+               get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
+               get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
 
 retry:
        switch (cfg->state) {
                break;
        }
 
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
        int rc = SUCCESS;
        int rcr = 0;
        struct Scsi_Host *host = scp->device->host;
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(host);
+       struct device *dev = &cfg->dev->dev;
 
-       pr_debug("%s: (scp=%p) %d/%d/%d/%llu "
-                "cdb=(%08X-%08X-%08X-%08X)\n", __func__, scp,
-                host->host_no, scp->device->channel,
-                scp->device->id, scp->device->lun,
-                get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
-                get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
-                get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
-                get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
+       dev_dbg(dev, "%s: (scp=%p) %d/%d/%d/%llu "
+               "cdb=(%08x-%08x-%08x-%08x)\n", __func__, scp, host->host_no,
+               scp->device->channel, scp->device->id, scp->device->lun,
+               get_unaligned_be32(&((u32 *)scp->cmnd)[0]),
+               get_unaligned_be32(&((u32 *)scp->cmnd)[1]),
+               get_unaligned_be32(&((u32 *)scp->cmnd)[2]),
+               get_unaligned_be32(&((u32 *)scp->cmnd)[3]));
 
        switch (cfg->state) {
        case STATE_NORMAL:
                break;
        }
 
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
                          struct device_attribute *attr,
                          char *buf)
 {
-       struct Scsi_Host *shost = class_to_shost(dev);
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)shost->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(class_to_shost(dev));
        struct afu *afu = cfg->afu;
 
        return cxlflash_show_port_status(0, afu, buf);
                          struct device_attribute *attr,
                          char *buf)
 {
-       struct Scsi_Host *shost = class_to_shost(dev);
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)shost->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(class_to_shost(dev));
        struct afu *afu = cfg->afu;
 
        return cxlflash_show_port_status(1, afu, buf);
 static ssize_t lun_mode_show(struct device *dev,
                             struct device_attribute *attr, char *buf)
 {
-       struct Scsi_Host *shost = class_to_shost(dev);
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)shost->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(class_to_shost(dev));
        struct afu *afu = cfg->afu;
 
        return scnprintf(buf, PAGE_SIZE, "%u\n", afu->internal_lun);
                              const char *buf, size_t count)
 {
        struct Scsi_Host *shost = class_to_shost(dev);
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)shost->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(shost);
        struct afu *afu = cfg->afu;
        int rc;
        u32 lun_mode;
 
        for (i = 0; i < CXLFLASH_NUM_VLUNS; i++)
                bytes += scnprintf(buf + bytes, PAGE_SIZE - bytes,
-                                  "%03d: %016llX\n", i, readq_be(&fc_port[i]));
+                                  "%03d: %016llx\n", i, readq_be(&fc_port[i]));
        return bytes;
 }
 
                                    struct device_attribute *attr,
                                    char *buf)
 {
-       struct Scsi_Host *shost = class_to_shost(dev);
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)shost->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(class_to_shost(dev));
        struct afu *afu = cfg->afu;
 
        return cxlflash_show_port_lun_table(0, afu, buf);
                                    struct device_attribute *attr,
                                    char *buf)
 {
-       struct Scsi_Host *shost = class_to_shost(dev);
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)shost->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(class_to_shost(dev));
        struct afu *afu = cfg->afu;
 
        return cxlflash_show_port_lun_table(1, afu, buf);
 {
        struct Scsi_Host *host;
        struct cxlflash_cfg *cfg = NULL;
+       struct device *dev = &pdev->dev;
        struct dev_dependent_vals *ddv;
        int rc = 0;
 
 
        host = scsi_host_alloc(&driver_template, sizeof(struct cxlflash_cfg));
        if (!host) {
-               dev_err(&pdev->dev, "%s: call to scsi_host_alloc failed!\n",
-                       __func__);
+               dev_err(dev, "%s: scsi_host_alloc failed\n", __func__);
                rc = -ENOMEM;
                goto out;
        }
        host->unique_id = host->host_no;
        host->max_cmd_len = CXLFLASH_MAX_CDB_LEN;
 
-       cfg = (struct cxlflash_cfg *)host->hostdata;
+       cfg = shost_priv(host);
        cfg->host = host;
        rc = alloc_mem(cfg);
        if (rc) {
-               dev_err(&pdev->dev, "%s: call to alloc_mem failed!\n",
-                       __func__);
+               dev_err(dev, "%s: alloc_mem failed\n", __func__);
                rc = -ENOMEM;
                scsi_host_put(cfg->host);
                goto out;
 
        rc = init_pci(cfg);
        if (rc) {
-               dev_err(&pdev->dev, "%s: call to init_pci "
-                       "failed rc=%d!\n", __func__, rc);
+               dev_err(dev, "%s: init_pci failed rc=%d\n", __func__, rc);
                goto out_remove;
        }
        cfg->init_state = INIT_STATE_PCI;
 
        rc = init_afu(cfg);
        if (rc) {
-               dev_err(&pdev->dev, "%s: call to init_afu "
-                       "failed rc=%d!\n", __func__, rc);
+               dev_err(dev, "%s: init_afu failed rc=%d\n", __func__, rc);
                goto out_remove;
        }
        cfg->init_state = INIT_STATE_AFU;
 
        rc = init_scsi(cfg);
        if (rc) {
-               dev_err(&pdev->dev, "%s: call to init_scsi "
-                       "failed rc=%d!\n", __func__, rc);
+               dev_err(dev, "%s: init_scsi failed rc=%d\n", __func__, rc);
                goto out_remove;
        }
        cfg->init_state = INIT_STATE_SCSI;
 
 out:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 
 out_remove:
                drain_ioctls(cfg);
                rc = cxlflash_mark_contexts_error(cfg);
                if (unlikely(rc))
-                       dev_err(dev, "%s: Failed to mark user contexts!(%d)\n",
+                       dev_err(dev, "%s: Failed to mark user contexts rc=%d\n",
                                __func__, rc);
                term_afu(cfg);
                return PCI_ERS_RESULT_NEED_RESET;
 
        rc = init_afu(cfg);
        if (unlikely(rc)) {
-               dev_err(dev, "%s: EEH recovery failed! (%d)\n", __func__, rc);
+               dev_err(dev, "%s: EEH recovery failed rc=%d\n", __func__, rc);
                return PCI_ERS_RESULT_DISCONNECT;
        }
 
  */
 static int __init init_cxlflash(void)
 {
-       pr_info("%s: %s\n", __func__, CXLFLASH_ADAPTER_NAME);
-
        cxlflash_list_init();
 
        return pci_register_driver(&cxlflash_driver);
 
        }
 
 out:
-       dev_dbg(dev, "%s: rctxid=%016llX ctxinfo=%p ctxpid=%u pid=%u "
+       dev_dbg(dev, "%s: rctxid=%016llx ctxinfo=%p ctxpid=%u pid=%u "
                "ctx_ctrl=%u\n", __func__, rctxid, ctxi, ctxpid, pid,
                ctx_ctrl);
 
        writeq_be(val, &ctrl_map->ctx_cap);
        val = readq_be(&ctrl_map->ctx_cap);
        if (val != (SISL_CTX_CAP_READ_CMD | SISL_CTX_CAP_WRITE_CMD)) {
-               dev_err(dev, "%s: ctx may be closed val=%016llX\n",
+               dev_err(dev, "%s: ctx may be closed val=%016llx\n",
                        __func__, val);
                rc = -EAGAIN;
                goto out;
  */
 static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct glun_info *gli = lli->parent;
        u8 *cmd_buf = NULL;
        scsi_cmd[1] = SAI_READ_CAPACITY_16;     /* service action */
        put_unaligned_be32(CMD_BUFSIZE, &scsi_cmd[10]);
 
-       dev_dbg(dev, "%s: %ssending cmd(0x%x)\n", __func__,
+       dev_dbg(dev, "%s: %ssending cmd(%02x)\n", __func__,
                retry_cnt ? "re" : "", scsi_cmd[0]);
 
        /* Drop the ioctl read semahpore across lengthy call */
        down_read(&cfg->ioctl_rwsem);
        rc = check_state(cfg);
        if (rc) {
-               dev_err(dev, "%s: Failed state! result=0x08%X\n",
+               dev_err(dev, "%s: Failed state result=%08x\n",
                        __func__, result);
                rc = -ENODEV;
                goto out;
        }
 
        if (result) {
-               dev_err(dev, "%s: command failed, result=0x%x\n",
+               dev_err(dev, "%s: command failed, result=%08x\n",
                        __func__, result);
                rc = -EIO;
                goto out;
 struct sisl_rht_entry *get_rhte(struct ctx_info *ctxi, res_hndl_t rhndl,
                                struct llun_info *lli)
 {
+       struct cxlflash_cfg *cfg = ctxi->cfg;
+       struct device *dev = &cfg->dev->dev;
        struct sisl_rht_entry *rhte = NULL;
 
        if (unlikely(!ctxi->rht_start)) {
-               pr_debug("%s: Context does not have allocated RHT!\n",
+               dev_dbg(dev, "%s: Context does not have allocated RHT\n",
                         __func__);
                goto out;
        }
 
        if (unlikely(rhndl >= MAX_RHT_PER_CONTEXT)) {
-               pr_debug("%s: Bad resource handle! (%d)\n", __func__, rhndl);
+               dev_dbg(dev, "%s: Bad resource handle rhndl=%d\n",
+                       __func__, rhndl);
                goto out;
        }
 
        if (unlikely(ctxi->rht_lun[rhndl] != lli)) {
-               pr_debug("%s: Bad resource handle LUN! (%d)\n",
-                        __func__, rhndl);
+               dev_dbg(dev, "%s: Bad resource handle LUN rhndl=%d\n",
+                       __func__, rhndl);
                goto out;
        }
 
        rhte = &ctxi->rht_start[rhndl];
        if (unlikely(rhte->nmask == 0)) {
-               pr_debug("%s: Unopened resource handle! (%d)\n",
-                        __func__, rhndl);
+               dev_dbg(dev, "%s: Unopened resource handle rhndl=%d\n",
+                       __func__, rhndl);
                rhte = NULL;
                goto out;
        }
 struct sisl_rht_entry *rhte_checkout(struct ctx_info *ctxi,
                                     struct llun_info *lli)
 {
+       struct cxlflash_cfg *cfg = ctxi->cfg;
+       struct device *dev = &cfg->dev->dev;
        struct sisl_rht_entry *rhte = NULL;
        int i;
 
        if (likely(rhte))
                ctxi->rht_lun[i] = lli;
 
-       pr_debug("%s: returning rhte=%p (%d)\n", __func__, rhte, i);
+       dev_dbg(dev, "%s: returning rhte=%p index=%d\n", __func__, rhte, i);
        return rhte;
 }
 
        if (gli->mode == MODE_NONE)
                gli->mode = mode;
        else if (gli->mode != mode) {
-               pr_debug("%s: LUN operating in mode %d, requested mode %d\n",
+               pr_debug("%s: gli_mode=%d requested_mode=%d\n",
                         __func__, gli->mode, mode);
                rc = -EINVAL;
                goto out;
                           struct ctx_info *ctxi,
                           struct dk_cxlflash_release *release)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
        struct sisl_rht_entry *rhte;
        struct sisl_rht_entry_f1 *rhte_f1;
 
-       dev_dbg(dev, "%s: ctxid=%llu rhndl=0x%llx gli->mode=%u gli->users=%u\n",
+       dev_dbg(dev, "%s: ctxid=%llu rhndl=%llu gli->mode=%u gli->users=%u\n",
                __func__, ctxid, release->rsrc_handle, gli->mode, gli->users);
 
        if (!ctxi) {
                ctxi = get_context(cfg, rctxid, lli, CTX_CTRL_ERR_FALLBACK);
                if (unlikely(!ctxi)) {
-                       dev_dbg(dev, "%s: Bad context! (%llu)\n",
+                       dev_dbg(dev, "%s: Bad context ctxid=%llu\n",
                                __func__, ctxid);
                        rc = -EINVAL;
                        goto out;
 
        rhte = get_rhte(ctxi, rhndl, lli);
        if (unlikely(!rhte)) {
-               dev_dbg(dev, "%s: Bad resource handle! (%d)\n",
+               dev_dbg(dev, "%s: Bad resource handle rhndl=%d\n",
                        __func__, rhndl);
                rc = -EINVAL;
                goto out;
        lli = kzalloc((MAX_RHT_PER_CONTEXT * sizeof(*lli)), GFP_KERNEL);
        ws = kzalloc((MAX_RHT_PER_CONTEXT * sizeof(*ws)), GFP_KERNEL);
        if (unlikely(!ctxi || !lli || !ws)) {
-               dev_err(dev, "%s: Unable to allocate context!\n", __func__);
+               dev_err(dev, "%s: Unable to allocate context\n", __func__);
                goto err;
        }
 
        rhte = (struct sisl_rht_entry *)get_zeroed_page(GFP_KERNEL);
        if (unlikely(!rhte)) {
-               dev_err(dev, "%s: Unable to allocate RHT!\n", __func__);
+               dev_err(dev, "%s: Unable to allocate RHT\n", __func__);
                goto err;
        }
 
                                 struct ctx_info *ctxi,
                                 struct dk_cxlflash_detach *detach)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct lun_access *lun_access, *t;
        if (!ctxi) {
                ctxi = get_context(cfg, rctxid, lli, CTX_CTRL_ERR_FALLBACK);
                if (unlikely(!ctxi)) {
-                       dev_dbg(dev, "%s: Bad context! (%llu)\n",
+                       dev_dbg(dev, "%s: Bad context ctxid=%llu\n",
                                __func__, ctxid);
                        rc = -EINVAL;
                        goto out;
 
        ctxid = cxl_process_element(ctx);
        if (unlikely(ctxid < 0)) {
-               dev_err(dev, "%s: Context %p was closed! (%d)\n",
+               dev_err(dev, "%s: Context %p was closed ctxid=%d\n",
                        __func__, ctx, ctxid);
                goto out;
        }
        if (unlikely(!ctxi)) {
                ctxi = get_context(cfg, ctxid, file, ctrl | CTX_CTRL_CLONE);
                if (!ctxi) {
-                       dev_dbg(dev, "%s: Context %d already free!\n",
+                       dev_dbg(dev, "%s: ctxid=%d already free\n",
                                __func__, ctxid);
                        goto out_release;
                }
 
-               dev_dbg(dev, "%s: Another process owns context %d!\n",
+               dev_dbg(dev, "%s: Another process owns ctxid=%d\n",
                        __func__, ctxid);
                put_context(ctxi);
                goto out;
        }
 
-       dev_dbg(dev, "%s: close for context %d\n", __func__, ctxid);
+       dev_dbg(dev, "%s: close for ctxid=%d\n", __func__, ctxid);
 
        detach.context_id = ctxi->ctxid;
        list_for_each_entry_safe(lun_access, t, &ctxi->luns, list)
 
 /**
  * get_err_page() - obtains and allocates the error notification page
+ * @cfg:       Internal structure associated with the host.
  *
  * Return: error notification page on success, NULL on failure
  */
-static struct page *get_err_page(void)
+static struct page *get_err_page(struct cxlflash_cfg *cfg)
 {
        struct page *err_page = global.err_page;
+       struct device *dev = &cfg->dev->dev;
 
        if (unlikely(!err_page)) {
                err_page = alloc_page(GFP_KERNEL);
                if (unlikely(!err_page)) {
-                       pr_err("%s: Unable to allocate err_page!\n", __func__);
+                       dev_err(dev, "%s: Unable to allocate err_page\n",
+                               __func__);
                        goto out;
                }
 
        }
 
 out:
-       pr_debug("%s: returning err_page=%p\n", __func__, err_page);
+       dev_dbg(dev, "%s: returning err_page=%p\n", __func__, err_page);
        return err_page;
 }
 
 
        ctxid = cxl_process_element(ctx);
        if (unlikely(ctxid < 0)) {
-               dev_err(dev, "%s: Context %p was closed! (%d)\n",
+               dev_err(dev, "%s: Context %p was closed ctxid=%d\n",
                        __func__, ctx, ctxid);
                goto err;
        }
 
        ctxi = get_context(cfg, ctxid, file, ctrl);
        if (unlikely(!ctxi)) {
-               dev_dbg(dev, "%s: Bad context! (%d)\n", __func__, ctxid);
+               dev_dbg(dev, "%s: Bad context ctxid=%d\n", __func__, ctxid);
                goto err;
        }
 
                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
                rc = ctxi->cxl_mmap_vmops->fault(vma, vmf);
        } else {
-               dev_dbg(dev, "%s: err recovery active, use err_page!\n",
+               dev_dbg(dev, "%s: err recovery active, use err_page\n",
                        __func__);
 
-               err_page = get_err_page();
+               err_page = get_err_page(cfg);
                if (unlikely(!err_page)) {
-                       dev_err(dev, "%s: Could not obtain error page!\n",
-                               __func__);
+                       dev_err(dev, "%s: Could not get err_page\n", __func__);
                        rc = VM_FAULT_RETRY;
                        goto out;
                }
 
        ctxid = cxl_process_element(ctx);
        if (unlikely(ctxid < 0)) {
-               dev_err(dev, "%s: Context %p was closed! (%d)\n",
+               dev_err(dev, "%s: Context %p was closed ctxid=%d\n",
                        __func__, ctx, ctxid);
                rc = -EIO;
                goto out;
 
        ctxi = get_context(cfg, ctxid, file, ctrl);
        if (unlikely(!ctxi)) {
-               dev_dbg(dev, "%s: Bad context! (%d)\n", __func__, ctxid);
+               dev_dbg(dev, "%s: Bad context ctxid=%d\n", __func__, ctxid);
                rc = -EIO;
                goto out;
        }
                        break;
                goto retry;
        case STATE_FAILTERM:
-               dev_dbg(dev, "%s: Failed/Terminating!\n", __func__);
+               dev_dbg(dev, "%s: Failed/Terminating\n", __func__);
                rc = -ENODEV;
                break;
        default:
 static int cxlflash_disk_attach(struct scsi_device *sdev,
                                struct dk_cxlflash_attach *attach)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct afu *afu = cfg->afu;
        struct llun_info *lli = sdev->hostdata;
        }
 
        if (gli->max_lba == 0) {
-               dev_dbg(dev, "%s: No capacity info for this LUN (%016llX)\n",
+               dev_dbg(dev, "%s: No capacity info for LUN=%016llx\n",
                        __func__, lli->lun_id[sdev->channel]);
                rc = read_cap16(sdev, lli);
                if (rc) {
-                       dev_err(dev, "%s: Invalid device! (%d)\n",
+                       dev_err(dev, "%s: Invalid device rc=%d\n",
                                __func__, rc);
                        rc = -ENODEV;
                        goto out;
                }
-               dev_dbg(dev, "%s: LBA = %016llX\n", __func__, gli->max_lba);
-               dev_dbg(dev, "%s: BLK_LEN = %08X\n", __func__, gli->blk_len);
+               dev_dbg(dev, "%s: LBA = %016llx\n", __func__, gli->max_lba);
+               dev_dbg(dev, "%s: BLK_LEN = %08x\n", __func__, gli->blk_len);
        }
 
        if (attach->hdr.flags & DK_CXLFLASH_ATTACH_REUSE_CONTEXT) {
                rctxid = attach->context_id;
                ctxi = get_context(cfg, rctxid, NULL, 0);
                if (!ctxi) {
-                       dev_dbg(dev, "%s: Bad context! (%016llX)\n",
+                       dev_dbg(dev, "%s: Bad context rctxid=%016llx\n",
                                __func__, rctxid);
                        rc = -EINVAL;
                        goto out;
 
                list_for_each_entry(lun_access, &ctxi->luns, list)
                        if (lun_access->lli == lli) {
-                               dev_dbg(dev, "%s: Already attached!\n",
+                               dev_dbg(dev, "%s: Already attached\n",
                                        __func__);
                                rc = -EINVAL;
                                goto out;
 
        rc = scsi_device_get(sdev);
        if (unlikely(rc)) {
-               dev_err(dev, "%s: Unable to get sdev reference!\n", __func__);
+               dev_err(dev, "%s: Unable to get sdev reference\n", __func__);
                goto out;
        }
 
        lun_access = kzalloc(sizeof(*lun_access), GFP_KERNEL);
        if (unlikely(!lun_access)) {
-               dev_err(dev, "%s: Unable to allocate lun_access!\n", __func__);
+               dev_err(dev, "%s: Unable to allocate lun_access\n", __func__);
                rc = -ENOMEM;
                goto err;
        }
 
        /* Non-NULL context indicates reuse (another context reference) */
        if (ctxi) {
-               dev_dbg(dev, "%s: Reusing context for LUN! (%016llX)\n",
+               dev_dbg(dev, "%s: Reusing context for LUN rctxid=%016llx\n",
                        __func__, rctxid);
                kref_get(&ctxi->kref);
                list_add(&lun_access->list, &ctxi->luns);
 
        ctxi = create_context(cfg);
        if (unlikely(!ctxi)) {
-               dev_err(dev, "%s: Failed to create context! (%d)\n",
+               dev_err(dev, "%s: Failed to create context ctxid=%d\n",
                        __func__, ctxid);
                goto err;
        }
 
        ctxid = cxl_process_element(ctx);
        if (unlikely((ctxid >= MAX_CONTEXT) || (ctxid < 0))) {
-               dev_err(dev, "%s: ctxid (%d) invalid!\n", __func__, ctxid);
+               dev_err(dev, "%s: ctxid=%d invalid\n", __func__, ctxid);
                rc = -EPERM;
                goto err;
        }
 
        ctxid = cxl_process_element(ctx);
        if (unlikely((ctxid >= MAX_CONTEXT) || (ctxid < 0))) {
-               dev_err(dev, "%s: ctxid (%d) invalid!\n", __func__, ctxid);
+               dev_err(dev, "%s: ctxid=%d invalid\n", __func__, ctxid);
                rc = -EPERM;
                goto err2;
        }
 static int cxlflash_afu_recover(struct scsi_device *sdev,
                                struct dk_cxlflash_recover_afu *recover)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct afu *afu = cfg->afu;
                goto out;
        rc = check_state(cfg);
        if (rc) {
-               dev_err(dev, "%s: Failed state! rc=%d\n", __func__, rc);
+               dev_err(dev, "%s: Failed state rc=%d\n", __func__, rc);
                rc = -ENODEV;
                goto out;
        }
 
-       dev_dbg(dev, "%s: reason 0x%016llX rctxid=%016llX\n",
+       dev_dbg(dev, "%s: reason=%016llx rctxid=%016llx\n",
                __func__, recover->reason, rctxid);
 
 retry:
        /* Ensure that this process is attached to the context */
        ctxi = get_context(cfg, rctxid, lli, CTX_CTRL_ERR_FALLBACK);
        if (unlikely(!ctxi)) {
-               dev_dbg(dev, "%s: Bad context! (%llu)\n", __func__, ctxid);
+               dev_dbg(dev, "%s: Bad context ctxid=%llu\n", __func__, ctxid);
                rc = -EINVAL;
                goto out;
        }
 retry_recover:
                rc = recover_context(cfg, ctxi, &new_adap_fd);
                if (unlikely(rc)) {
-                       dev_err(dev, "%s: Recovery failed for context %llu (rc=%d)\n",
+                       dev_err(dev, "%s: Recovery failed ctxid=%llu rc=%d\n",
                                __func__, ctxid, rc);
                        if ((rc == -ENODEV) &&
                            ((atomic_read(&cfg->recovery_threads) > 1) ||
                             (lretry--))) {
-                               dev_dbg(dev, "%s: Going to try again!\n",
+                               dev_dbg(dev, "%s: Going to try again\n",
                                        __func__);
                                mutex_unlock(mutex);
                                msleep(100);
                goto retry;
        }
 
-       dev_dbg(dev, "%s: MMIO working, no recovery required!\n", __func__);
+       dev_dbg(dev, "%s: MMIO working, no recovery required\n", __func__);
 out:
        if (likely(ctxi))
                put_context(ctxi);
 static int process_sense(struct scsi_device *sdev,
                         struct dk_cxlflash_verify *verify)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
        rc = scsi_normalize_sense((const u8 *)&verify->sense_data,
                                  DK_CXLFLASH_VERIFY_SENSE_LEN, &sshdr);
        if (!rc) {
-               dev_err(dev, "%s: Failed to normalize sense data!\n", __func__);
+               dev_err(dev, "%s: Failed to normalize sense data\n", __func__);
                rc = -EINVAL;
                goto out;
        }
 {
        int rc = 0;
        struct ctx_info *ctxi = NULL;
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
            rctxid = verify->context_id;
        u64 last_lba = 0;
 
-       dev_dbg(dev, "%s: ctxid=%llu rhndl=%016llX, hint=%016llX, "
-               "flags=%016llX\n", __func__, ctxid, verify->rsrc_handle,
+       dev_dbg(dev, "%s: ctxid=%llu rhndl=%016llx, hint=%016llx, "
+               "flags=%016llx\n", __func__, ctxid, verify->rsrc_handle,
                verify->hint, verify->hdr.flags);
 
        ctxi = get_context(cfg, rctxid, lli, 0);
        if (unlikely(!ctxi)) {
-               dev_dbg(dev, "%s: Bad context! (%llu)\n", __func__, ctxid);
+               dev_dbg(dev, "%s: Bad context ctxid=%llu\n", __func__, ctxid);
                rc = -EINVAL;
                goto out;
        }
 
        rhte = get_rhte(ctxi, rhndl, lli);
        if (unlikely(!rhte)) {
-               dev_dbg(dev, "%s: Bad resource handle! (%d)\n",
+               dev_dbg(dev, "%s: Bad resource handle rhndl=%d\n",
                        __func__, rhndl);
                rc = -EINVAL;
                goto out;
 out:
        if (likely(ctxi))
                put_context(ctxi);
-       dev_dbg(dev, "%s: returning rc=%d llba=%llX\n",
+       dev_dbg(dev, "%s: returning rc=%d llba=%llx\n",
                __func__, rc, verify->last_lba);
        return rc;
 }
  */
 static int cxlflash_disk_direct_open(struct scsi_device *sdev, void *arg)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct afu *afu = cfg->afu;
        struct llun_info *lli = sdev->hostdata;
        struct ctx_info *ctxi = NULL;
        struct sisl_rht_entry *rhte = NULL;
 
-       pr_debug("%s: ctxid=%llu ls=0x%llx\n", __func__, ctxid, lun_size);
+       dev_dbg(dev, "%s: ctxid=%llu ls=%llu\n", __func__, ctxid, lun_size);
 
        rc = cxlflash_lun_attach(gli, MODE_PHYSICAL, false);
        if (unlikely(rc)) {
-               dev_dbg(dev, "%s: Failed to attach to LUN! (PHYSICAL)\n",
-                       __func__);
+               dev_dbg(dev, "%s: Failed attach to LUN (PHYSICAL)\n", __func__);
                goto out;
        }
 
        ctxi = get_context(cfg, rctxid, lli, 0);
        if (unlikely(!ctxi)) {
-               dev_dbg(dev, "%s: Bad context! (%llu)\n", __func__, ctxid);
+               dev_dbg(dev, "%s: Bad context ctxid=%llu\n", __func__, ctxid);
                rc = -EINVAL;
                goto err1;
        }
 
        rhte = rhte_checkout(ctxi, lli);
        if (unlikely(!rhte)) {
-               dev_dbg(dev, "%s: too many opens for this context\n", __func__);
+               dev_dbg(dev, "%s: Too many opens ctxid=%lld\n",
+                       __func__, ctxid);
                rc = -EMFILE;   /* too many opens  */
                goto err1;
        }
 out:
        if (likely(ctxi))
                put_context(ctxi);
-       dev_dbg(dev, "%s: returning handle 0x%llx rc=%d llba %lld\n",
+       dev_dbg(dev, "%s: returning handle=%llu rc=%d llba=%llu\n",
                __func__, rsrc_handle, rc, last_lba);
        return rc;
 
  */
 static int ioctl_common(struct scsi_device *sdev, int cmd)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        int rc = 0;
                case DK_CXLFLASH_VLUN_RESIZE:
                case DK_CXLFLASH_RELEASE:
                case DK_CXLFLASH_DETACH:
-                       dev_dbg(dev, "%s: Command override! (%d)\n",
+                       dev_dbg(dev, "%s: Command override rc=%d\n",
                                __func__, rc);
                        rc = 0;
                        break;
 {
        typedef int (*sioctl) (struct scsi_device *, void *);
 
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct afu *afu = cfg->afu;
        struct dk_cxlflash_hdr *hdr;
        }
 
        if (unlikely(copy_from_user(&buf, arg, size))) {
-               dev_err(dev, "%s: copy_from_user() fail! "
+               dev_err(dev, "%s: copy_from_user() fail "
                        "size=%lu cmd=%d (%s) arg=%p\n",
                        __func__, size, cmd, decode_ioctl(cmd), arg);
                rc = -EFAULT;
        }
 
        if (hdr->rsvd[0] || hdr->rsvd[1] || hdr->rsvd[2] || hdr->return_flags) {
-               dev_dbg(dev, "%s: Reserved/rflags populated!\n", __func__);
+               dev_dbg(dev, "%s: Reserved/rflags populated\n", __func__);
                rc = -EINVAL;
                goto cxlflash_ioctl_exit;
        }
        rc = do_ioctl(sdev, (void *)&buf);
        if (likely(!rc))
                if (unlikely(copy_to_user(arg, &buf, size))) {
-                       dev_err(dev, "%s: copy_to_user() fail! "
+                       dev_err(dev, "%s: copy_to_user() fail "
                                "size=%lu cmd=%d (%s) arg=%p\n",
                                __func__, size, cmd, decode_ioctl(cmd), arg);
                        rc = -EFAULT;
 
        int last_word_underflow = 0;
        u64 *lam;
 
-       pr_debug("%s: Initializing LUN: lun_id = %llX, "
-                "ba_lun->lsize = %lX, ba_lun->au_size = %lX\n",
+       pr_debug("%s: Initializing LUN: lun_id=%016llx "
+                "ba_lun->lsize=%lx ba_lun->au_size=%lX\n",
                __func__, ba_lun->lun_id, ba_lun->lsize, ba_lun->au_size);
 
        /* Calculate bit map size */
        /* Allocate lun information container */
        bali = kzalloc(sizeof(struct ba_lun_info), GFP_KERNEL);
        if (unlikely(!bali)) {
-               pr_err("%s: Failed to allocate lun_info for lun_id %llX\n",
+               pr_err("%s: Failed to allocate lun_info lun_id=%016llx\n",
                       __func__, ba_lun->lun_id);
                return -ENOMEM;
        }
                                      GFP_KERNEL);
        if (unlikely(!bali->lun_alloc_map)) {
                pr_err("%s: Failed to allocate lun allocation map: "
-                      "lun_id = %llX\n", __func__, ba_lun->lun_id);
+                      "lun_id=%016llx\n", __func__, ba_lun->lun_id);
                kfree(bali);
                return -ENOMEM;
        }
        bali->aun_clone_map = kzalloc((bali->total_aus * sizeof(u8)),
                                      GFP_KERNEL);
        if (unlikely(!bali->aun_clone_map)) {
-               pr_err("%s: Failed to allocate clone map: lun_id = %llX\n",
+               pr_err("%s: Failed to allocate clone map: lun_id=%016llx\n",
                       __func__, ba_lun->lun_id);
                kfree(bali->lun_alloc_map);
                kfree(bali);
        ba_lun->ba_lun_handle = bali;
 
        pr_debug("%s: Successfully initialized the LUN: "
-                "lun_id = %llX, bitmap size = %X, free_aun_cnt = %llX\n",
+                "lun_id=%016llx bitmap size=%x, free_aun_cnt=%llx\n",
                __func__, ba_lun->lun_id, bali->lun_bmap_size,
                bali->free_aun_cnt);
        return 0;
                        num_bits = (sizeof(*lam) * BITS_PER_BYTE);
                        bit_pos = find_first_bit(lam, num_bits);
 
-                       pr_devel("%s: Found free bit %llX in LUN "
-                                "map entry %llX at bitmap index = %X\n",
-                                __func__, bit_pos, bali->lun_alloc_map[i],
-                                i);
+                       pr_devel("%s: Found free bit %llu in LUN "
+                                "map entry %016llx at bitmap index = %d\n",
+                                __func__, bit_pos, bali->lun_alloc_map[i], i);
 
                        *bit_word = i;
                        bali->free_aun_cnt--;
        bali = ba_lun->ba_lun_handle;
 
        pr_debug("%s: Received block allocation request: "
-                "lun_id = %llX, free_aun_cnt = %llX\n",
+                "lun_id=%016llx free_aun_cnt=%llx\n",
                 __func__, ba_lun->lun_id, bali->free_aun_cnt);
 
        if (bali->free_aun_cnt == 0) {
-               pr_debug("%s: No space left on LUN: lun_id = %llX\n",
+               pr_debug("%s: No space left on LUN: lun_id=%016llx\n",
                         __func__, ba_lun->lun_id);
                return -1ULL;
        }
                                          bali, &bit_word);
                if (bit_pos == -1) {
                        pr_debug("%s: Could not find an allocation unit on LUN:"
-                                " lun_id = %llX\n", __func__, ba_lun->lun_id);
+                                " lun_id=%016llx\n", __func__, ba_lun->lun_id);
                        return -1ULL;
                }
        }
        else
                bali->free_curr_idx = bit_word;
 
-       pr_debug("%s: Allocating AU number %llX, on lun_id %llX, "
-                "free_aun_cnt = %llX\n", __func__,
+       pr_debug("%s: Allocating AU number=%llx lun_id=%016llx "
+                "free_aun_cnt=%llx\n", __func__,
                 ((bit_word * BITS_PER_LONG) + bit_pos), ba_lun->lun_id,
                 bali->free_aun_cnt);
 
        bali = ba_lun->ba_lun_handle;
 
        if (validate_alloc(bali, to_free)) {
-               pr_debug("%s: The AUN %llX is not allocated on lun_id %llX\n",
+               pr_debug("%s: AUN %llx is not allocated on lun_id=%016llx\n",
                         __func__, to_free, ba_lun->lun_id);
                return -1;
        }
 
-       pr_debug("%s: Received a request to free AU %llX on lun_id %llX, "
-                "free_aun_cnt = %llX\n", __func__, to_free, ba_lun->lun_id,
+       pr_debug("%s: Received a request to free AU=%llx lun_id=%016llx "
+                "free_aun_cnt=%llx\n", __func__, to_free, ba_lun->lun_id,
                 bali->free_aun_cnt);
 
        if (bali->aun_clone_map[to_free] > 0) {
-               pr_debug("%s: AUN %llX on lun_id %llX has been cloned. Clone "
-                        "count = %X\n", __func__, to_free, ba_lun->lun_id,
+               pr_debug("%s: AUN %llx lun_id=%016llx cloned. Clone count=%x\n",
+                        __func__, to_free, ba_lun->lun_id,
                         bali->aun_clone_map[to_free]);
                bali->aun_clone_map[to_free]--;
                return 0;
        else if (idx > bali->free_high_idx)
                bali->free_high_idx = idx;
 
-       pr_debug("%s: Successfully freed AU at bit_pos %X, bit map index %X on "
-                "lun_id %llX, free_aun_cnt = %llX\n", __func__, bit_pos, idx,
+       pr_debug("%s: Successfully freed AU bit_pos=%x bit map index=%x "
+                "lun_id=%016llx free_aun_cnt=%llx\n", __func__, bit_pos, idx,
                 ba_lun->lun_id, bali->free_aun_cnt);
 
        return 0;
        struct ba_lun_info *bali = ba_lun->ba_lun_handle;
 
        if (validate_alloc(bali, to_clone)) {
-               pr_debug("%s: AUN %llX is not allocated on lun_id %llX\n",
+               pr_debug("%s: AUN=%llx not allocated on lun_id=%016llx\n",
                         __func__, to_clone, ba_lun->lun_id);
                return -1;
        }
 
-       pr_debug("%s: Received a request to clone AUN %llX on lun_id %llX\n",
+       pr_debug("%s: Received a request to clone AUN %llx on lun_id=%016llx\n",
                 __func__, to_clone, ba_lun->lun_id);
 
        if (bali->aun_clone_map[to_clone] == MAX_AUN_CLONE_CNT) {
-               pr_debug("%s: AUN %llX on lun_id %llX hit max clones already\n",
+               pr_debug("%s: AUN %llx on lun_id=%016llx hit max clones already\n",
                         __func__, to_clone, ba_lun->lun_id);
                return -1;
        }
        u64 offset = lba;
        int left = nblks;
        u32 to = sdev->request_queue->rq_timeout;
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
 
        cmd_buf = kzalloc(CMD_BUFSIZE, GFP_KERNEL);
                down_read(&cfg->ioctl_rwsem);
                rc = check_state(cfg);
                if (rc) {
-                       dev_err(dev, "%s: Failed state! result=0x08%X\n",
+                       dev_err(dev, "%s: Failed state result=%08x\n",
                                __func__, result);
                        rc = -ENODEV;
                        goto out;
 
                if (result) {
                        dev_err_ratelimited(dev, "%s: command failed for "
-                                           "offset %lld result=0x%x\n",
+                                           "offset=%lld result=%08x\n",
                                            __func__, offset, result);
                        rc = -EIO;
                        goto out;
        kfree(cmd_buf);
        kfree(scsi_cmd);
        kfree(sense_buf);
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
                    struct sisl_rht_entry *rhte,
                    u64 *new_size)
 {
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct sisl_lxt_entry *lxt = NULL, *lxt_old = NULL;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
        mutex_lock(&blka->mutex);
        av_size = ba_space(&blka->ba_lun);
        if (unlikely(av_size <= 0)) {
-               pr_debug("%s: ba_space error: av_size %d\n", __func__, av_size);
+               dev_dbg(dev, "%s: ba_space error av_size=%d\n",
+                       __func__, av_size);
                mutex_unlock(&blka->mutex);
                rc = -ENOSPC;
                goto out;
                 */
                aun = ba_alloc(&blka->ba_lun);
                if ((aun == -1ULL) || (aun >= blka->nchunk))
-                       pr_debug("%s: ba_alloc error: allocated chunk# %llX, "
-                                "max %llX\n", __func__, aun, blka->nchunk - 1);
+                       dev_dbg(dev, "%s: ba_alloc error allocated chunk=%llu "
+                               "max=%llu\n", __func__, aun, blka->nchunk - 1);
 
                /* select both ports, use r/w perms from RHT */
                lxt[i].rlba_base = ((aun << MC_CHUNK_SHIFT) |
                kfree(lxt_old);
        *new_size = my_new_size;
 out:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
                      struct ctx_info *ctxi,
                      u64 *new_size)
 {
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct sisl_lxt_entry *lxt, *lxt_old;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
                kfree(lxt_old);
        *new_size = my_new_size;
 out:
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
                          struct ctx_info *ctxi,
                          struct dk_cxlflash_resize *resize)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
        struct afu *afu = cfg->afu;
        nsectors = (resize->req_size * CXLFLASH_BLOCK_SIZE) / gli->blk_len;
        new_size = DIV_ROUND_UP(nsectors, MC_CHUNK_SIZE);
 
-       pr_debug("%s: ctxid=%llu rhndl=0x%llx, req_size=0x%llx,"
-                "new_size=%llx\n", __func__, ctxid, resize->rsrc_handle,
-                resize->req_size, new_size);
+       dev_dbg(dev, "%s: ctxid=%llu rhndl=%llu req_size=%llu new_size=%llu\n",
+               __func__, ctxid, resize->rsrc_handle, resize->req_size,
+               new_size);
 
        if (unlikely(gli->mode != MODE_VIRTUAL)) {
-               pr_debug("%s: LUN mode does not support resize! (%d)\n",
-                        __func__, gli->mode);
+               dev_dbg(dev, "%s: LUN mode does not support resize mode=%d\n",
+                       __func__, gli->mode);
                rc = -EINVAL;
                goto out;
 
        if (!ctxi) {
                ctxi = get_context(cfg, rctxid, lli, CTX_CTRL_ERR_FALLBACK);
                if (unlikely(!ctxi)) {
-                       pr_debug("%s: Bad context! (%llu)\n", __func__, ctxid);
+                       dev_dbg(dev, "%s: Bad context ctxid=%llu\n",
+                               __func__, ctxid);
                        rc = -EINVAL;
                        goto out;
                }
 
        rhte = get_rhte(ctxi, rhndl, lli);
        if (unlikely(!rhte)) {
-               pr_debug("%s: Bad resource handle! (%u)\n", __func__, rhndl);
+               dev_dbg(dev, "%s: Bad resource handle rhndl=%u\n",
+                       __func__, rhndl);
                rc = -EINVAL;
                goto out;
        }
 out:
        if (put_ctx)
                put_context(ctxi);
-       pr_debug("%s: resized to %lld returning rc=%d\n",
-                __func__, resize->last_lba, rc);
+       dev_dbg(dev, "%s: resized to %llu returning rc=%d\n",
+               __func__, resize->last_lba, rc);
        return rc;
 }
 
        u32 chan;
        u32 lind;
        struct afu *afu = cfg->afu;
+       struct device *dev = &cfg->dev->dev;
        struct sisl_global_map __iomem *agm = &afu->afu_map->global;
 
        mutex_lock(&global.mutex);
                if (lli->port_sel == BOTH_PORTS) {
                        writeq_be(lli->lun_id[0], &agm->fc_port[0][lind]);
                        writeq_be(lli->lun_id[1], &agm->fc_port[1][lind]);
-                       pr_debug("%s: Virtual LUN on slot %d  id0=%llx, "
-                                "id1=%llx\n", __func__, lind,
-                                lli->lun_id[0], lli->lun_id[1]);
+                       dev_dbg(dev, "%s: Virtual LUN on slot %d  id0=%llx "
+                               "id1=%llx\n", __func__, lind,
+                               lli->lun_id[0], lli->lun_id[1]);
                } else {
                        chan = PORT2CHAN(lli->port_sel);
                        writeq_be(lli->lun_id[chan], &agm->fc_port[chan][lind]);
-                       pr_debug("%s: Virtual LUN on slot %d chan=%d, "
-                                "id=%llx\n", __func__, lind, chan,
-                                lli->lun_id[chan]);
+                       dev_dbg(dev, "%s: Virtual LUN on slot %d chan=%d "
+                               "id=%llx\n", __func__, lind, chan,
+                               lli->lun_id[chan]);
                }
        }
 
        u32 lind;
        int rc = 0;
        struct afu *afu = cfg->afu;
+       struct device *dev = &cfg->dev->dev;
        struct sisl_global_map __iomem *agm = &afu->afu_map->global;
 
        mutex_lock(&global.mutex);
                writeq_be(lli->lun_id[0], &agm->fc_port[0][lind]);
                writeq_be(lli->lun_id[1], &agm->fc_port[1][lind]);
                cfg->promote_lun_index++;
-               pr_debug("%s: Virtual LUN on slot %d  id0=%llx, id1=%llx\n",
-                        __func__, lind, lli->lun_id[0], lli->lun_id[1]);
+               dev_dbg(dev, "%s: Virtual LUN on slot %d  id0=%llx id1=%llx\n",
+                       __func__, lind, lli->lun_id[0], lli->lun_id[1]);
        } else {
                /*
                 * If this LUN is visible only from one port, we will put
                lind = lli->lun_index = cfg->last_lun_index[chan];
                writeq_be(lli->lun_id[chan], &agm->fc_port[chan][lind]);
                cfg->last_lun_index[chan]--;
-               pr_debug("%s: Virtual LUN on slot %d  chan=%d, id=%llx\n",
-                        __func__, lind, chan, lli->lun_id[chan]);
+               dev_dbg(dev, "%s: Virtual LUN on slot %d  chan=%d id=%llx\n",
+                       __func__, lind, chan, lli->lun_id[chan]);
        }
 
        lli->in_table = true;
 out:
        mutex_unlock(&global.mutex);
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 }
 
  */
 int cxlflash_disk_virtual_open(struct scsi_device *sdev, void *arg)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
        struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
        struct ctx_info *ctxi = NULL;
        struct sisl_rht_entry *rhte = NULL;
 
-       pr_debug("%s: ctxid=%llu ls=0x%llx\n", __func__, ctxid, lun_size);
+       dev_dbg(dev, "%s: ctxid=%llu ls=%llu\n", __func__, ctxid, lun_size);
 
        /* Setup the LUNs block allocator on first call */
        mutex_lock(&gli->mutex);
        if (gli->mode == MODE_NONE) {
                rc = init_vlun(lli);
                if (rc) {
-                       dev_err(dev, "%s: call to init_vlun failed rc=%d!\n",
+                       dev_err(dev, "%s: init_vlun failed rc=%d\n",
                                __func__, rc);
                        rc = -ENOMEM;
                        goto err0;
 
        rc = cxlflash_lun_attach(gli, MODE_VIRTUAL, true);
        if (unlikely(rc)) {
-               dev_err(dev, "%s: Failed to attach to LUN! (VIRTUAL)\n",
-                       __func__);
+               dev_err(dev, "%s: Failed attach to LUN (VIRTUAL)\n", __func__);
                goto err0;
        }
        mutex_unlock(&gli->mutex);
 
        rc = init_luntable(cfg, lli);
        if (rc) {
-               dev_err(dev, "%s: call to init_luntable failed rc=%d!\n",
-                       __func__, rc);
+               dev_err(dev, "%s: init_luntable failed rc=%d\n", __func__, rc);
                goto err1;
        }
 
        ctxi = get_context(cfg, rctxid, lli, 0);
        if (unlikely(!ctxi)) {
-               dev_err(dev, "%s: Bad context! (%llu)\n", __func__, ctxid);
+               dev_err(dev, "%s: Bad context ctxid=%llu\n", __func__, ctxid);
                rc = -EINVAL;
                goto err1;
        }
 
        rhte = rhte_checkout(ctxi, lli);
        if (unlikely(!rhte)) {
-               dev_err(dev, "%s: too many opens for this context\n", __func__);
+               dev_err(dev, "%s: too many opens ctxid=%llu\n",
+                       __func__, ctxid);
                rc = -EMFILE;   /* too many opens  */
                goto err1;
        }
        resize.rsrc_handle = rsrc_handle;
        rc = _cxlflash_vlun_resize(sdev, ctxi, &resize);
        if (rc) {
-               dev_err(dev, "%s: resize failed rc %d\n", __func__, rc);
+               dev_err(dev, "%s: resize failed rc=%d\n", __func__, rc);
                goto err2;
        }
        last_lba = resize.last_lba;
 out:
        if (likely(ctxi))
                put_context(ctxi);
-       pr_debug("%s: returning handle 0x%llx rc=%d llba %lld\n",
-                __func__, rsrc_handle, rc, last_lba);
+       dev_dbg(dev, "%s: returning handle=%llu rc=%d llba=%llu\n",
+               __func__, rsrc_handle, rc, last_lba);
        return rc;
 
 err2:
                     struct sisl_rht_entry *rhte,
                     struct sisl_rht_entry *rhte_src)
 {
+       struct cxlflash_cfg *cfg = afu->parent;
+       struct device *dev = &cfg->dev->dev;
        struct sisl_lxt_entry *lxt;
        u32 ngrps;
        u64 aun;                /* chunk# allocated by block allocator */
 
        cxlflash_afu_sync(afu, ctxid, rhndl, AFU_LW_SYNC);
 
-       pr_debug("%s: returning\n", __func__);
+       dev_dbg(dev, "%s: returning\n", __func__);
        return 0;
 }
 
 int cxlflash_disk_clone(struct scsi_device *sdev,
                        struct dk_cxlflash_clone *clone)
 {
-       struct cxlflash_cfg *cfg = (struct cxlflash_cfg *)sdev->host->hostdata;
+       struct cxlflash_cfg *cfg = shost_priv(sdev->host);
+       struct device *dev = &cfg->dev->dev;
        struct llun_info *lli = sdev->hostdata;
        struct glun_info *gli = lli->parent;
        struct blka *blka = &gli->blka;
        bool found;
        LIST_HEAD(sidecar);
 
-       pr_debug("%s: ctxid_src=%llu ctxid_dst=%llu\n",
-                __func__, ctxid_src, ctxid_dst);
+       dev_dbg(dev, "%s: ctxid_src=%llu ctxid_dst=%llu\n",
+               __func__, ctxid_src, ctxid_dst);
 
        /* Do not clone yourself */
        if (unlikely(rctxid_src == rctxid_dst)) {
 
        if (unlikely(gli->mode != MODE_VIRTUAL)) {
                rc = -EINVAL;
-               pr_debug("%s: Clone not supported on physical LUNs! (%d)\n",
-                        __func__, gli->mode);
+               dev_dbg(dev, "%s: Only supported on virtual LUNs mode=%u\n",
+                       __func__, gli->mode);
                goto out;
        }
 
        ctxi_src = get_context(cfg, rctxid_src, lli, CTX_CTRL_CLONE);
        ctxi_dst = get_context(cfg, rctxid_dst, lli, 0);
        if (unlikely(!ctxi_src || !ctxi_dst)) {
-               pr_debug("%s: Bad context! (%llu,%llu)\n", __func__,
-                        ctxid_src, ctxid_dst);
+               dev_dbg(dev, "%s: Bad context ctxid_src=%llu ctxid_dst=%llu\n",
+                       __func__, ctxid_src, ctxid_dst);
                rc = -EINVAL;
                goto out;
        }
                        lun_access_dst = kzalloc(sizeof(*lun_access_dst),
                                                 GFP_KERNEL);
                        if (unlikely(!lun_access_dst)) {
-                               pr_err("%s: Unable to allocate lun_access!\n",
-                                      __func__);
+                               dev_err(dev, "%s: lun_access allocation fail\n",
+                                       __func__);
                                rc = -ENOMEM;
                                goto out;
                        }
        }
 
        if (unlikely(!ctxi_src->rht_out)) {
-               pr_debug("%s: Nothing to clone!\n", __func__);
+               dev_dbg(dev, "%s: Nothing to clone\n", __func__);
                goto out_success;
        }
 
                put_context(ctxi_src);
        if (ctxi_dst)
                put_context(ctxi_dst);
-       pr_debug("%s: returning rc=%d\n", __func__, rc);
+       dev_dbg(dev, "%s: returning rc=%d\n", __func__, rc);
        return rc;
 
 err: