mirror of
https://github.com/Dasharo/linux.git
synced 2026-03-06 15:25:10 -08:00
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 ...
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
|
||||
@@ -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"),
|
||||
};
|
||||
|
||||
|
||||
@@ -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"),
|
||||
};
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -417,7 +417,7 @@ out_disable_clks:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -185,7 +185,7 @@ static void ahci_ceva_setup(struct ahci_host_priv *hpriv)
|
||||
}
|
||||
}
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -153,7 +153,7 @@ static const struct ata_port_info ahci_da850_port_info = {
|
||||
.port_ops = &ahci_da850_port_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ static const struct ata_port_info ahci_dm816_port_info = {
|
||||
.port_ops = &ahci_dm816_port_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_dm816_platform_sht = {
|
||||
static const struct scsi_host_template ahci_dm816_platform_sht = {
|
||||
AHCI_SHT(AHCI_DM816_DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -398,7 +398,7 @@ static const struct ata_port_info ahci_dwc_port_info = {
|
||||
.port_ops = &ahci_dwc_port_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_dwc_scsi_info = {
|
||||
static const struct scsi_host_template ahci_dwc_scsi_info = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -979,7 +979,7 @@ static u32 imx_ahci_parse_props(struct device *dev,
|
||||
return reg_value;
|
||||
}
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -37,7 +37,7 @@ static const struct ata_port_info ahci_port_info = {
|
||||
.port_ops = &ahci_platform_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -178,7 +178,7 @@ static const struct ata_port_info ahci_mvebu_port_info = {
|
||||
.port_ops = &ahci_platform_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@ static const struct ata_port_info ahci_port_info_nolpm = {
|
||||
.port_ops = &ahci_platform_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -159,7 +159,7 @@ static const struct ata_port_info ahci_qoriq_port_info = {
|
||||
.port_ops = &ahci_qoriq_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_qoriq_sht = {
|
||||
static const struct scsi_host_template ahci_qoriq_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -72,7 +72,7 @@ static const struct ata_port_info ahci_port_seattle_info = {
|
||||
.port_ops = &ahci_seattle_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -138,7 +138,7 @@ static const struct ata_port_info st_ahci_port_info = {
|
||||
.port_ops = &st_ahci_port_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -206,7 +206,7 @@ static const struct ata_port_info ahci_sunxi_port_info = {
|
||||
.port_ops = &ahci_platform_ops,
|
||||
};
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -506,7 +506,7 @@ static const struct of_device_id tegra_ahci_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, tegra_ahci_of_match);
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -710,7 +710,7 @@ static int xgene_ahci_mux_select(struct xgene_ahci_context *ctx)
|
||||
return val & CFG_SATA_ENET_SELECT_MASK ? -1 : 0;
|
||||
}
|
||||
|
||||
static struct scsi_host_template ahci_platform_sht = {
|
||||
static const struct scsi_host_template ahci_platform_sht = {
|
||||
AHCI_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
@@ -95,7 +95,7 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct scsi_host_template generic_sht = {
|
||||
static const struct scsi_host_template generic_sht = {
|
||||
ATA_BMDMA_SHT(DRV_NAME),
|
||||
};
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user