Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull SCSI updates from James Bottomley:
 "This is mostly update of the usual drivers: arcmsr, qla2xxx, lpfc,
  hisi_sas, target/iscsi and target/core.

  Additionally Christoph refactored gdth as part of the dma changes. The
  major mid-layer change this time is the removal of bidi commands and
  with them the whole of the osd/exofs driver and filesystem. This is a
  major simplification for block and mq in particular"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (240 commits)
  scsi: cxgb4i: validate tcp sequence number only if chip version <= T5
  scsi: cxgb4i: get pf number from lldi->pf
  scsi: core: replace GFP_ATOMIC with GFP_KERNEL in scsi_scan.c
  scsi: mpt3sas: Add missing breaks in switch statements
  scsi: aacraid: Fix missing break in switch statement
  scsi: kill command serial number
  scsi: csiostor: drop serial_number usage
  scsi: mvumi: use request tag instead of serial_number
  scsi: dpt_i2o: remove serial number usage
  scsi: st: osst: Remove negative constant left-shifts
  scsi: ufs-bsg: Allow reading descriptors
  scsi: ufs: Allow reading descriptor via raw upiu
  scsi: ufs-bsg: Change the calling convention for write descriptor
  scsi: ufs: Remove unused device quirks
  Revert "scsi: ufs: disable vccq if it's not needed by UFS device"
  scsi: megaraid_sas: Remove a bunch of set but not used variables
  scsi: clean obsolete return values of eh_timed_out
  scsi: sd: Optimal I/O size should be a multiple of physical block size
  scsi: MAINTAINERS: SCSI initiator and target tweaks
  scsi: fcoe: make use of fip_mode enum complete
  ...

2 files changed, 2 insertions, 22 deletions

diff --git a/drivers/scsi/qedi/qedi_debugfs.c b/drivers/scsi/qedi/qedi_debugfs.c
index fd914ca4149a..5667e4752e2e 100644
--- a/drivers/scsi/qedi/qedi_debugfs.c
+++ b/drivers/scsi/qedi/qedi_debugfs.c
@@ -23,27 +23,16 @@ qedi_dbg_host_init(struct qedi_dbg_ctx *qedi,
                    const struct file_operations *fops)
 {
         char host_dirname[32];
-        struct dentry *file_dentry = NULL;
 
         sprintf(host_dirname, "host%u", qedi->host_no);
         qedi->bdf_dentry = debugfs_create_dir(host_dirname, qedi_dbg_root);
-        if (!qedi->bdf_dentry)
-                return;
 
         while (dops) {
                 if (!(dops->name))
                         break;
 
-                file_dentry = debugfs_create_file(dops->name, 0600,
-                                                  qedi->bdf_dentry, qedi,
-                                                  fops);
-                if (!file_dentry) {
-                        QEDI_INFO(qedi, QEDI_LOG_DEBUGFS,
-                                  "Debugfs entry %s creation failed\n",
-                                  dops->name);
-                        debugfs_remove_recursive(qedi->bdf_dentry);
-                        return;
-                }
+                debugfs_create_file(dops->name, 0600, qedi->bdf_dentry, qedi,
+                                    fops);
                 dops++;
                 fops++;
         }
@@ -60,8 +49,6 @@ void
 qedi_dbg_init(char *drv_name)
 {
         qedi_dbg_root = debugfs_create_dir(drv_name, NULL);
-        if (!qedi_dbg_root)
-                QEDI_INFO(NULL, QEDI_LOG_DEBUGFS, "Init of debugfs failed\n");
 }
 
 void
diff --git a/drivers/scsi/qedi/qedi_fw.c b/drivers/scsi/qedi/qedi_fw.c
index 25d763ae5d5a..e2a995a6e8e7 100644
--- a/drivers/scsi/qedi/qedi_fw.c
+++ b/drivers/scsi/qedi/qedi_fw.c
@@ -616,13 +616,6 @@ static void qedi_scsi_completion(struct qedi_ctx *qedi,
                 goto error;
         }
 
-        if (!sc_cmd->request->special) {
-                QEDI_WARN(&qedi->dbg_ctx,
-                          "request->special is NULL so request not valid, sc_cmd=%p.\n",
-                          sc_cmd);
-                goto error;
-        }
-
         if (!sc_cmd->request->q) {
                 QEDI_WARN(&qedi->dbg_ctx,
                           "request->q is NULL so request is not valid, sc_cmd=%p.\n",