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

Pull SCSI fixes from James Bottomley:
 "One minor fix and two patches reworking the ata dma drain for the
  !CONFIG_LIBATA case. The latter is a 5.7 regression fix"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: Wire up ata_scsi_dma_need_drain for SAS HBA drivers
  scsi: libata: Provide an ata_scsi_dma_need_drain stub for !CONFIG_ATA
  scsi: ufs-bsg: Fix runtime PM imbalance on error

diff --combined include/linux/libata.h
index 675895ffa2ddb9c041660339e2984953e954bc59,042e584daca73e2c7735b4ed74ba3c3f41114a79..e7e5256817dc2e040ed99cedaab8056eebbc69ad
--- 1/include/linux/libata.h
--- 2/include/linux/libata.h
+++ b/include/linux/libata.h
@@@ -22,7 -22,6 +22,7 @@@
  #include <linux/acpi.h>
  #include <linux/cdrom.h>
  #include <linux/sched.h>
 +#include <linux/async.h>
  
  /*
   * Define if arch has non-standard setup.  This is a _PCI_ standard
@@@ -610,7 -609,7 +610,7 @@@ struct ata_host 
        struct task_struct      *eh_owner;
  
        struct ata_port         *simplex_claimed;       /* channel owning the DMA */
 -      struct ata_port         *ports[0];
 +      struct ata_port         *ports[];
  };
  
  struct ata_queued_cmd {
@@@ -873,8 -872,6 +873,8 @@@ struct ata_port 
        struct timer_list       fastdrain_timer;
        unsigned long           fastdrain_cnt;
  
 +      async_cookie_t          cookie;
 +
        int                     em_message_type;
        void                    *private_data;
  
@@@ -1095,7 -1092,11 +1095,11 @@@ extern int ata_scsi_ioctl(struct scsi_d
  #define ATA_SCSI_COMPAT_IOCTL /* empty */
  #endif
  extern int ata_scsi_queuecmd(struct Scsi_Host *h, struct scsi_cmnd *cmd);
+ #if IS_ENABLED(CONFIG_ATA)
  bool ata_scsi_dma_need_drain(struct request *rq);
+ #else
+ #define ata_scsi_dma_need_drain NULL
+ #endif
  extern int ata_sas_scsi_ioctl(struct ata_port *ap, struct scsi_device *dev,
                            unsigned int cmd, void __user *arg);
  extern bool ata_link_online(struct ata_link *link);