Commit 62d15dba authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "Constify most SCSI host templates" 

Bart Van Assche <bvanassche@acm.org> says:

It helps humans and the compiler if it is made explicit that SCSI host
templates are not modified. Hence this patch series that constifies most
SCSI host templates. Please consider this patch series for the next merge
window.

Link: https://lore.kernel.org/r/20230322195515.1267197-1-bvanassche@acm.org


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 9abb593e 04d1fa43

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),

};