Commit b68ee1c6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI updates from James Bottomley:
 "Updates to the usual drivers (megaraid_sas, scsi_debug, lpfc, target,
  mpi3mr, hisi_sas, arcmsr).

  The major core change is the constification of the host templates
  (which touches everything) along with other minor fixups and clean
  ups"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (207 commits)
  scsi: ufs: mcq: Use pointer arithmetic in ufshcd_send_command()
  scsi: ufs: mcq: Annotate ufshcd_inc_sq_tail() appropriately
  scsi: cxlflash: s/semahpore/semaphore/
  scsi: lpfc: Silence an incorrect device output
  scsi: mpi3mr: Use IRQ save variants of spinlock to protect chain frame allocation
  scsi: scsi_debug: Fix missing error code in scsi_debug_init()
  scsi: hisi_sas: Work around build failure in suspend function
  scsi: lpfc: Fix ioremap issues in lpfc_sli4_pci_mem_setup()
  scsi: mpt3sas: Fix an issue when driver is being removed
  scsi: mpt3sas: Remove HBA BIOS version in the kernel log
  scsi: target: core: Fix invalid memory access
  scsi: scsi_debug: Drop sdebug_queue
  scsi: scsi_debug: Only allow sdebug_max_queue be modified when no shosts
  scsi: scsi_debug: Use scsi_host_busy() in delay_store() and ndelay_store()
  scsi: scsi_debug: Use blk_mq_tagset_busy_iter() in stop_all_queued()
  scsi: scsi_debug: Use blk_mq_tagset_busy_iter() in sdebug_blk_mq_poll()
  scsi: scsi_debug: Dynamically allocate sdebug_queued_cmd
  scsi: scsi_debug: Use scsi_block_requests() to block queues
  scsi: scsi_debug: Protect block_unblock_all_queues() with mutex
  scsi: scsi_debug: Change shost list lock to a mutex
  ...
parents 36006b1d 3c85f087

Documentation/scsi/scsi_mid_low_api.rst

+1 −1
Original line number Diff line number Diff line
@@ -436,7 +436,7 @@ Details:: 
    *

    *      Defined in: drivers/scsi/hosts.c .

    **/

    struct Scsi_Host * scsi_host_alloc(struct scsi_host_template * sht,

    struct Scsi_Host * scsi_host_alloc(const struct scsi_host_template * sht,

				    int privsize)

drivers/ata/acard-ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg 
static int acard_ahci_pci_device_resume(struct pci_dev *pdev);

#endif



static struct scsi_host_template acard_ahci_sht = {

static const struct scsi_host_template acard_ahci_sht = {

	AHCI_SHT("acard-ahci"),

};

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int ahci_pci_device_resume(struct device *dev); 
#endif

#endif /* CONFIG_PM */



static struct scsi_host_template ahci_sht = {

static const struct scsi_host_template ahci_sht = {

	AHCI_SHT("ahci"),

};

drivers/ata/ahci.h

+1 −1
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ void ahci_set_em_messages(struct ahci_host_priv *hpriv, 
			  struct ata_port_info *pi);

int ahci_reset_em(struct ata_host *host);

void ahci_print_info(struct ata_host *host, const char *scc_s);

int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht);

int ahci_host_activate(struct ata_host *host, const struct scsi_host_template *sht);

void ahci_error_handler(struct ata_port *ap);

u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked);

drivers/ata/ahci_brcm.c

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ static int __maybe_unused brcm_ahci_resume(struct device *dev) 
	return ret;

}



static struct scsi_host_template ahci_platform_sht = {

static const struct scsi_host_template ahci_platform_sht = {

	AHCI_SHT(DRV_NAME),

};