Skip to content

Commit b68ee1c

Browse files
committed
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 ...
2 parents 36006b1 + 3c85f08 commit b68ee1c

File tree

317 files changed

+2255
-1843
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

317 files changed

+2255
-1843
lines changed

Documentation/scsi/scsi_mid_low_api.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ Details::
436436
*
437437
* Defined in: drivers/scsi/hosts.c .
438438
**/
439-
struct Scsi_Host * scsi_host_alloc(struct scsi_host_template * sht,
439+
struct Scsi_Host * scsi_host_alloc(const struct scsi_host_template * sht,
440440
int privsize)
441441

442442

drivers/ata/acard-ahci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg
6666
static int acard_ahci_pci_device_resume(struct pci_dev *pdev);
6767
#endif
6868

69-
static struct scsi_host_template acard_ahci_sht = {
69+
static const struct scsi_host_template acard_ahci_sht = {
7070
AHCI_SHT("acard-ahci"),
7171
};
7272

drivers/ata/ahci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ static int ahci_pci_device_resume(struct device *dev);
101101
#endif
102102
#endif /* CONFIG_PM */
103103

104-
static struct scsi_host_template ahci_sht = {
104+
static const struct scsi_host_template ahci_sht = {
105105
AHCI_SHT("ahci"),
106106
};
107107

drivers/ata/ahci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ void ahci_set_em_messages(struct ahci_host_priv *hpriv,
430430
struct ata_port_info *pi);
431431
int ahci_reset_em(struct ata_host *host);
432432
void ahci_print_info(struct ata_host *host, const char *scc_s);
433-
int ahci_host_activate(struct ata_host *host, struct scsi_host_template *sht);
433+
int ahci_host_activate(struct ata_host *host, const struct scsi_host_template *sht);
434434
void ahci_error_handler(struct ata_port *ap);
435435
u32 ahci_handle_port_intr(struct ata_host *host, u32 irq_masked);
436436

drivers/ata/ahci_brcm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ static int __maybe_unused brcm_ahci_resume(struct device *dev)
417417
return ret;
418418
}
419419

420-
static struct scsi_host_template ahci_platform_sht = {
420+
static const struct scsi_host_template ahci_platform_sht = {
421421
AHCI_SHT(DRV_NAME),
422422
};
423423

drivers/ata/ahci_ceva.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ static void ahci_ceva_setup(struct ahci_host_priv *hpriv)
185185
}
186186
}
187187

188-
static struct scsi_host_template ahci_platform_sht = {
188+
static const struct scsi_host_template ahci_platform_sht = {
189189
AHCI_SHT(DRV_NAME),
190190
};
191191

drivers/ata/ahci_da850.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ static const struct ata_port_info ahci_da850_port_info = {
153153
.port_ops = &ahci_da850_port_ops,
154154
};
155155

156-
static struct scsi_host_template ahci_platform_sht = {
156+
static const struct scsi_host_template ahci_platform_sht = {
157157
AHCI_SHT(DRV_NAME),
158158
};
159159

drivers/ata/ahci_dm816.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ static const struct ata_port_info ahci_dm816_port_info = {
134134
.port_ops = &ahci_dm816_port_ops,
135135
};
136136

137-
static struct scsi_host_template ahci_dm816_platform_sht = {
137+
static const struct scsi_host_template ahci_dm816_platform_sht = {
138138
AHCI_SHT(AHCI_DM816_DRV_NAME),
139139
};
140140

drivers/ata/ahci_dwc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ static const struct ata_port_info ahci_dwc_port_info = {
398398
.port_ops = &ahci_dwc_port_ops,
399399
};
400400

401-
static struct scsi_host_template ahci_dwc_scsi_info = {
401+
static const struct scsi_host_template ahci_dwc_scsi_info = {
402402
AHCI_SHT(DRV_NAME),
403403
};
404404

drivers/ata/ahci_imx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -979,7 +979,7 @@ static u32 imx_ahci_parse_props(struct device *dev,
979979
return reg_value;
980980
}
981981

982-
static struct scsi_host_template ahci_platform_sht = {
982+
static const struct scsi_host_template ahci_platform_sht = {
983983
AHCI_SHT(DRV_NAME),
984984
};
985985

0 commit comments

Comments
 (0)