scsi: ata: Declare SCSI host templates const
authorBart Van Assche <bvanassche@acm.org>
Wed, 22 Mar 2023 19:53:59 +0000 (12:53 -0700)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 24 Mar 2023 23:19:19 +0000 (19:19 -0400)
Make it explicit that ATA host templates are not modified.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Serge Semin <fancer.lancer@gmail.com> (for DWC AHCI SATA)
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Jon Hunter <jonathanh@nvidia.com> (for Tegra)
Cc: Christoph Hellwig <hch@lst.de>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Hannes Reinecke <hare@suse.de>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Mike Christie <michael.christie@oracle.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20230322195515.1267197-5-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
111 files changed:
drivers/ata/acard-ahci.c
drivers/ata/ahci.c
drivers/ata/ahci.h
drivers/ata/ahci_brcm.c
drivers/ata/ahci_ceva.c
drivers/ata/ahci_da850.c
drivers/ata/ahci_dm816.c
drivers/ata/ahci_dwc.c
drivers/ata/ahci_imx.c
drivers/ata/ahci_mtk.c
drivers/ata/ahci_mvebu.c
drivers/ata/ahci_platform.c
drivers/ata/ahci_qoriq.c
drivers/ata/ahci_seattle.c
drivers/ata/ahci_st.c
drivers/ata/ahci_sunxi.c
drivers/ata/ahci_tegra.c
drivers/ata/ahci_xgene.c
drivers/ata/ata_generic.c
drivers/ata/ata_piix.c
drivers/ata/libahci.c
drivers/ata/libahci_platform.c
drivers/ata/libata-core.c
drivers/ata/libata-scsi.c
drivers/ata/libata-sff.c
drivers/ata/libata.h
drivers/ata/pata_acpi.c
drivers/ata/pata_ali.c
drivers/ata/pata_amd.c
drivers/ata/pata_arasan_cf.c
drivers/ata/pata_artop.c
drivers/ata/pata_atiixp.c
drivers/ata/pata_atp867x.c
drivers/ata/pata_buddha.c
drivers/ata/pata_cmd640.c
drivers/ata/pata_cmd64x.c
drivers/ata/pata_cs5520.c
drivers/ata/pata_cs5530.c
drivers/ata/pata_cs5535.c
drivers/ata/pata_cs5536.c
drivers/ata/pata_cypress.c
drivers/ata/pata_efar.c
drivers/ata/pata_ep93xx.c
drivers/ata/pata_falcon.c
drivers/ata/pata_ftide010.c
drivers/ata/pata_gayle.c
drivers/ata/pata_hpt366.c
drivers/ata/pata_hpt37x.c
drivers/ata/pata_hpt3x2n.c
drivers/ata/pata_hpt3x3.c
drivers/ata/pata_icside.c
drivers/ata/pata_imx.c
drivers/ata/pata_isapnp.c
drivers/ata/pata_it8213.c
drivers/ata/pata_it821x.c
drivers/ata/pata_ixp4xx_cf.c
drivers/ata/pata_jmicron.c
drivers/ata/pata_legacy.c
drivers/ata/pata_macio.c
drivers/ata/pata_marvell.c
drivers/ata/pata_mpc52xx.c
drivers/ata/pata_mpiix.c
drivers/ata/pata_netcell.c
drivers/ata/pata_ninja32.c
drivers/ata/pata_ns87410.c
drivers/ata/pata_ns87415.c
drivers/ata/pata_octeon_cf.c
drivers/ata/pata_of_platform.c
drivers/ata/pata_oldpiix.c
drivers/ata/pata_opti.c
drivers/ata/pata_optidma.c
drivers/ata/pata_parport/pata_parport.c
drivers/ata/pata_pcmcia.c
drivers/ata/pata_pdc2027x.c
drivers/ata/pata_pdc202xx_old.c
drivers/ata/pata_piccolo.c
drivers/ata/pata_platform.c
drivers/ata/pata_pxa.c
drivers/ata/pata_radisys.c
drivers/ata/pata_rb532_cf.c
drivers/ata/pata_rdc.c
drivers/ata/pata_rz1000.c
drivers/ata/pata_sc1200.c
drivers/ata/pata_sch.c
drivers/ata/pata_serverworks.c
drivers/ata/pata_sil680.c
drivers/ata/pata_sis.c
drivers/ata/pata_sl82c105.c
drivers/ata/pata_triflex.c
drivers/ata/pata_via.c
drivers/ata/pdc_adma.c
drivers/ata/sata_dwc_460ex.c
drivers/ata/sata_fsl.c
drivers/ata/sata_highbank.c
drivers/ata/sata_inic162x.c
drivers/ata/sata_mv.c
drivers/ata/sata_nv.c
drivers/ata/sata_promise.c
drivers/ata/sata_qstor.c
drivers/ata/sata_rcar.c
drivers/ata/sata_sil.c
drivers/ata/sata_sil24.c
drivers/ata/sata_sis.c
drivers/ata/sata_svw.c
drivers/ata/sata_sx4.c
drivers/ata/sata_uli.c
drivers/ata/sata_via.c
drivers/ata/sata_vsc.c
include/linux/ahci_platform.h
include/linux/ata_platform.h
include/linux/libata.h

index 993eadd173daf564a73da38a655d71516114ee76..547f5634170574c0dcd8cb09e0d77dd1722c6d21 100644 (file)
@@ -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"),
 };
 
index 14a1c0d14916f928bbbd34f235af7f2a3b3febd2..addba109406bef11df1c3e39e65318f1157335e7 100644 (file)
@@ -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"),
 };
 
index ff8e6ae1c6362f2a26abde461910bd1a388f1655..4bae95b06ae3c953de7a567c35f9b46dd9e3083f 100644 (file)
@@ -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);
 
index 6f216eb2561004c0918958e36e55c5c90a9c9c57..4e3dc2b6d67f8199aa1ce1c0cb712e7ba396dfd4 100644 (file)
@@ -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),
 };
 
index cb24ecf36fafe040c97aa7c90eb02f76c87c249c..bc027468decb9a3950fc16b00be1863c5c94cc51 100644 (file)
@@ -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),
 };
 
index dc8a019b8340d33f17c103f8045c58ffc94568f2..ca0924dc5bd26ba424b26bd040bf83720c96b56f 100644 (file)
@@ -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),
 };
 
index d26efcd20f6433d6f99d5cd50c22f4410a84fc4d..b08547b877a1f77ba220e925de321ed034147d7b 100644 (file)
@@ -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),
 };
 
index 8fb66860db318d57dd86aab3a895427eb4707e36..4bfbb09cdc029410aea49337cb5e72ad0792cfac 100644 (file)
@@ -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),
 };
 
index a950767f794839046ef2fb8915bcd72cf1b1a7fe..1c1139dae29af873cb75136322aa6c966ef07887 100644 (file)
@@ -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),
 };
 
index c056378e3e721ed4600cc6845afcfb1dea073edf..f6a75341256f7769b5aedd0557619942d154aec6 100644 (file)
@@ -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),
 };
 
index 22ecc4f3ae79af39b528bfd3111634b7f53efd81..596cf017f42791d38dd440d3860abf1ac47db389 100644 (file)
@@ -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),
 };
 
index 8f5572a9f8f196328a6172e6db599124e3499a1d..299ee686ac49a616d029f33503cc6840e00887bf 100644 (file)
@@ -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),
 };
 
index 9cf9bf36a874013379475a542b89a26a7ee553fe..0ba764d283c86a5fff3766b7262aad7ebdf4e3c4 100644 (file)
@@ -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),
 };
 
index ced12705ed9d036c223b2c2e425fa80576df35c8..9eda7bbd215138e0ef00efa5f9415da237191dc8 100644 (file)
@@ -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),
 };
 
index 8607b68eee532bea60e11edc4ee9c6d5762455ca..f2c1edb3698615e1f4ec2b92cc86c4e5eb6c5743 100644 (file)
@@ -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),
 };
 
index c7273c1cb0c73b9b0032aedbfc9404a51b311c96..076c12b4ba08bd9a15bfc9c6b443dd09bfc48177 100644 (file)
@@ -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),
 };
 
index 4fb94db1217dfa98c2d4988130a69fdfbccd93c7..8e5e2b359f2d2049dbd8e34ec5170c15b8cf12a5 100644 (file)
@@ -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),
 };
 
index 1e08704d5117315a26b5ff383ae769891e152f48..83f5ff54ef5b9c1537fff064a2f9f50468204d54 100644 (file)
@@ -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),
 };
 
index 20a32e4d501d342630631bc9460f221a918c53e2..2f57ec00ab821684511a1c85fc5981aaf2c303fa 100644 (file)
@@ -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),
 };
 
index ade5e894563b3c32421da0dcabbab422faa8cd6a..ec3c5bd1f813499fb110b8a6f3b9bd094fee6630 100644 (file)
@@ -1059,7 +1059,7 @@ static u8 piix_vmw_bmdma_status(struct ata_port *ap)
        return ata_bmdma_status(ap) & ~ATA_DMA_ERR;
 }
 
-static struct scsi_host_template piix_sht = {
+static const struct scsi_host_template piix_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
@@ -1095,7 +1095,7 @@ static struct attribute *piix_sidpr_shost_attrs[] = {
 
 ATTRIBUTE_GROUPS(piix_sidpr_shost);
 
-static struct scsi_host_template piix_sidpr_sht = {
+static const struct scsi_host_template piix_sidpr_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
        .shost_groups           = piix_sidpr_shost_groups,
 };
@@ -1645,7 +1645,7 @@ static int piix_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        struct device *dev = &pdev->dev;
        struct ata_port_info port_info[2];
        const struct ata_port_info *ppi[] = { &port_info[0], &port_info[1] };
-       struct scsi_host_template *sht = &piix_sht;
+       const struct scsi_host_template *sht = &piix_sht;
        unsigned long port_flags;
        struct ata_host *host;
        struct piix_host_priv *hpriv;
index 8f216de766488fe9d42edfa7b1e8c9f7d303e833..9c2cb6cbea762284b78ac1250d64fc85cd2da948 100644 (file)
@@ -2692,7 +2692,7 @@ void ahci_set_em_messages(struct ahci_host_priv *hpriv,
 EXPORT_SYMBOL_GPL(ahci_set_em_messages);
 
 static int ahci_host_activate_multi_irqs(struct ata_host *host,
-                                        struct scsi_host_template *sht)
+                                        const struct scsi_host_template *sht)
 {
        struct ahci_host_priv *hpriv = host->private_data;
        int i, rc;
@@ -2736,7 +2736,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host,
  *     RETURNS:
  *     0 on success, -errno otherwise.
  */
-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)
 {
        struct ahci_host_priv *hpriv = host->private_data;
        int irq = hpriv->irq;
index b9e336bacf179bdabc905b920c9be3d1dfe8a550..d6c3a6ffb0b37e982f38c5eaf2f840ec742f1ab6 100644 (file)
@@ -680,7 +680,7 @@ EXPORT_SYMBOL_GPL(ahci_platform_get_resources);
 int ahci_platform_init_host(struct platform_device *pdev,
                            struct ahci_host_priv *hpriv,
                            const struct ata_port_info *pi_template,
-                           struct scsi_host_template *sht)
+                           const struct scsi_host_template *sht)
 {
        struct device *dev = &pdev->dev;
        struct ata_port_info pi = *pi_template;
index 14c17c3bda4e6f4dbae39c1cfa1abeab08804723..8bf612bdd61a5a1d8d04d70fd8579249ede7c728 100644 (file)
@@ -5775,7 +5775,7 @@ static void async_port_probe(void *data, async_cookie_t cookie)
  *     RETURNS:
  *     0 on success, -errno otherwise.
  */
-int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)
+int ata_host_register(struct ata_host *host, const struct scsi_host_template *sht)
 {
        int i, rc;
 
@@ -5883,7 +5883,7 @@ EXPORT_SYMBOL_GPL(ata_host_register);
  */
 int ata_host_activate(struct ata_host *host, int irq,
                      irq_handler_t irq_handler, unsigned long irq_flags,
-                     struct scsi_host_template *sht)
+                     const struct scsi_host_template *sht)
 {
        int i, rc;
        char *irq_desc;
index e093c7a7deebd6493b3089a7c879c10726c40f6b..7bb12deab70c465bb2a701548bdc044cd8bcb11f 100644 (file)
@@ -4186,7 +4186,7 @@ void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd)
        scsi_done(cmd);
 }
 
-int ata_scsi_add_hosts(struct ata_host *host, struct scsi_host_template *sht)
+int ata_scsi_add_hosts(struct ata_host *host, const struct scsi_host_template *sht)
 {
        int i, rc;
 
index cd82d3b5ed14fe361067d06c7b4d5ce526ef5e2a..9d28badfe41d667af5ecbdc9274bd912ba4f6612 100644 (file)
@@ -2281,7 +2281,7 @@ EXPORT_SYMBOL_GPL(ata_pci_sff_prepare_host);
  */
 int ata_pci_sff_activate_host(struct ata_host *host,
                              irq_handler_t irq_handler,
-                             struct scsi_host_template *sht)
+                             const struct scsi_host_template *sht)
 {
        struct device *dev = host->dev;
        struct pci_dev *pdev = to_pci_dev(dev);
@@ -2378,7 +2378,7 @@ static const struct ata_port_info *ata_sff_find_valid_pi(
 
 static int ata_pci_init_one(struct pci_dev *pdev,
                const struct ata_port_info * const *ppi,
-               struct scsi_host_template *sht, void *host_priv,
+               const struct scsi_host_template *sht, void *host_priv,
                int hflags, bool bmdma)
 {
        struct device *dev = &pdev->dev;
@@ -2452,7 +2452,7 @@ out:
  */
 int ata_pci_sff_init_one(struct pci_dev *pdev,
                 const struct ata_port_info * const *ppi,
-                struct scsi_host_template *sht, void *host_priv, int hflag)
+                const struct scsi_host_template *sht, void *host_priv, int hflag)
 {
        return ata_pci_init_one(pdev, ppi, sht, host_priv, hflag, 0);
 }
@@ -3175,7 +3175,7 @@ EXPORT_SYMBOL_GPL(ata_pci_bmdma_prepare_host);
  */
 int ata_pci_bmdma_init_one(struct pci_dev *pdev,
                           const struct ata_port_info * const * ppi,
-                          struct scsi_host_template *sht, void *host_priv,
+                          const struct scsi_host_template *sht, void *host_priv,
                           int hflags)
 {
        return ata_pci_init_one(pdev, ppi, sht, host_priv, hflags, 1);
index 2cd6124a01e8ad56744735d0fda48abc0db8e791..926d0d33cd29ffe4c71b886e87e723c11de90a24 100644 (file)
@@ -111,7 +111,7 @@ static inline void ata_acpi_bind_dev(struct ata_device *dev) {}
 extern struct ata_device *ata_scsi_find_dev(struct ata_port *ap,
                                            const struct scsi_device *scsidev);
 extern int ata_scsi_add_hosts(struct ata_host *host,
-                             struct scsi_host_template *sht);
+                             const struct scsi_host_template *sht);
 extern void ata_scsi_scan_host(struct ata_port *ap, int sync);
 extern int ata_scsi_offline_dev(struct ata_device *dev);
 extern bool ata_scsi_sense_is_valid(u8 sk, u8 asc, u8 ascq);
index f8706ee427d26e2ebb6b84a0e3b70ce8ae5bb01a..ab38871b5e0074d112b016dca67dff3e2a3b9895 100644 (file)
@@ -205,7 +205,7 @@ static int pacpi_port_start(struct ata_port *ap)
        return ata_bmdma_port_start(ap);
 }
 
-static struct scsi_host_template pacpi_sht = {
+static const struct scsi_host_template pacpi_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 76ad0e73fe2a183cab4ffdb7e43bc6dc7afa8d55..bb790edd603611f158be7c8e59a91dadc5949f00 100644 (file)
@@ -355,7 +355,7 @@ static void ali_c2_c3_postreset(struct ata_link *link, unsigned int *classes)
        ata_sff_postreset(link, classes);
 }
 
-static struct scsi_host_template ali_sht = {
+static const struct scsi_host_template ali_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index f216f9d7b9ec5770707a070b33c3c8b0ec93823f..5b02b89748b7fcef13c86d3a6034587099fbb29d 100644 (file)
@@ -388,7 +388,7 @@ static void nv_host_stop(struct ata_host *host)
        pci_write_config_dword(to_pci_dev(host->dev), 0x60, udma);
 }
 
-static struct scsi_host_template amd_sht = {
+static const struct scsi_host_template amd_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index e89617ed9175b5f3afd94d8d4141e5c84447ac00..6ab294322e7927a48dbd80a31bdf4a3e701256ab 100644 (file)
@@ -218,7 +218,7 @@ struct arasan_cf_dev {
        struct ata_queued_cmd *qc;
 };
 
-static struct scsi_host_template arasan_cf_sht = {
+static const struct scsi_host_template arasan_cf_sht = {
        ATA_BASE_SHT(DRIVER_NAME),
        .dma_boundary = 0xFFFFFFFFUL,
 };
index 20a8f31a3f572e6ded8ac563a73b64f4a8cdae5c..40544282f455b6f532bfb1146db7e6e1b8210d04 100644 (file)
@@ -292,7 +292,7 @@ static int artop6210_qc_defer(struct ata_queued_cmd *qc)
        return 0;
 }
 
-static struct scsi_host_template artop_sht = {
+static const struct scsi_host_template artop_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index efdb94cff68b57bfc2168da2d17f523fccdc238d..8c5cc803aab35aa64acde47fea8b19cbdc608664 100644 (file)
@@ -251,7 +251,7 @@ static void atiixp_bmdma_stop(struct ata_queued_cmd *qc)
        ata_bmdma_stop(qc);
 }
 
-static struct scsi_host_template atiixp_sht = {
+static const struct scsi_host_template atiixp_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = LIBATA_DUMB_MAX_PRD,
        .dma_boundary           = ATA_DMA_BOUNDARY,
index 779d660415c8b9cfd24116e2f52b4c96fcaf09e4..aaef5924f6366d3278e4f1ff3d034c1117d109de 100644 (file)
@@ -259,7 +259,7 @@ static int atp867x_cable_detect(struct ata_port *ap)
        return ATA_CBL_PATA_UNK;
 }
 
-static struct scsi_host_template atp867x_sht = {
+static const struct scsi_host_template atp867x_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 27d4c417fc60bb0f1f62dee3156cf4a373146e9b..49bc619b83e255a34e14f41dd53deb3c61cf818d 100644 (file)
@@ -57,7 +57,7 @@ static unsigned int xsurf_bases[2] = {
        XSURF_BASE1, XSURF_BASE2
 };
 
-static struct scsi_host_template pata_buddha_sht = {
+static const struct scsi_host_template pata_buddha_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 1a3372a7221382e7d5a0f70b9fa174cba24d87aa..45a7217b136edcf4afd8def0aa3f6004792a1af2 100644 (file)
@@ -172,7 +172,7 @@ static bool cmd640_sff_irq_check(struct ata_port *ap)
        return irq_stat & irq_mask;
 }
 
-static struct scsi_host_template cmd640_sht = {
+static const struct scsi_host_template cmd640_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 5baa4a7819c176ff776d8bf9e57d855998ac5fe4..fafea2b791451b5f52fd4adf5806f4786ea5e9fb 100644 (file)
@@ -319,7 +319,7 @@ static void cmd646r1_bmdma_stop(struct ata_queued_cmd *qc)
        ata_bmdma_stop(qc);
 }
 
-static struct scsi_host_template cmd64x_sht = {
+static const struct scsi_host_template cmd64x_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index f4289a532f871561e2bc40bb274a627b48dbacc0..422d42761a1d7fe73d65228e547992c4b497c38e 100644 (file)
@@ -94,7 +94,7 @@ static void cs5520_set_piomode(struct ata_port *ap, struct ata_device *adev)
        cs5520_set_timings(ap, adev, adev->pio_mode);
 }
 
-static struct scsi_host_template cs5520_sht = {
+static const struct scsi_host_template cs5520_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = LIBATA_DUMB_MAX_PRD,
        .dma_boundary           = ATA_DMA_BOUNDARY,
index d5b7ac14e78f5f680ee049b5bd4a332abd6d3b9f..1e67b0f8db438390f4a616dadabaac661b89a22a 100644 (file)
@@ -146,7 +146,7 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc)
        return ata_bmdma_qc_issue(qc);
 }
 
-static struct scsi_host_template cs5530_sht = {
+static const struct scsi_host_template cs5530_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize   = LIBATA_DUMB_MAX_PRD,
        .dma_boundary   = ATA_DMA_BOUNDARY,
index c2c3238ff84bfae1b82c7ec2732c94a2d66a930a..d793fc441b4673f2e5d321db0784816d1eada6cd 100644 (file)
@@ -141,7 +141,7 @@ static void cs5535_set_dmamode(struct ata_port *ap, struct ata_device *adev)
        wrmsr(ATAC_CH0D0_DMA + 2 * adev->devno, reg, 0);
 }
 
-static struct scsi_host_template cs5535_sht = {
+static const struct scsi_host_template cs5535_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index ab47aeb5587f55133f19a52eaef09a0b04dbcb9b..b811efd2cc346a69c73b1b1fe52c15eae6e92a36 100644 (file)
@@ -217,7 +217,7 @@ static void cs5536_set_dmamode(struct ata_port *ap, struct ata_device *adev)
        cs5536_write(pdev, ETC, etc);
 }
 
-static struct scsi_host_template cs5536_sht = {
+static const struct scsi_host_template cs5536_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 3be5d52a777b2f56e1cd34527e3925f0e6b5c94f..ae347b5c287185c09b10bea611de6db0635ab538 100644 (file)
@@ -115,7 +115,7 @@ static void cy82c693_set_dmamode(struct ata_port *ap, struct ata_device *adev)
        outb(0x50, 0x23);
 }
 
-static struct scsi_host_template cy82c693_sht = {
+static const struct scsi_host_template cy82c693_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 21da59f35b41b97f0be8c30f556b7656838df608..2e6eccf2902fa1dba08452ffc5cab8809d86c156 100644 (file)
@@ -234,7 +234,7 @@ static void efar_set_dmamode (struct ata_port *ap, struct ata_device *adev)
        spin_unlock_irqrestore(&efar_lock, flags);
 }
 
-static struct scsi_host_template efar_sht = {
+static const struct scsi_host_template efar_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 47845d9200750f6f3caf22f239e2dd9c04f1b7f9..c6e043e05d43b768f32edef39252fc3f7f20644d 100644 (file)
@@ -872,7 +872,7 @@ static int ep93xx_pata_port_start(struct ata_port *ap)
        return 0;
 }
 
-static struct scsi_host_template ep93xx_pata_sht = {
+static const struct scsi_host_template ep93xx_pata_sht = {
        ATA_BASE_SHT(DRV_NAME),
        /* ep93xx dma implementation limit */
        .sg_tablesize           = 32,
index 823c88622e34a089e670a8bb9d7dc0838ced78d5..996516e64f13504e38cb372e6b87b721418832c5 100644 (file)
@@ -33,7 +33,7 @@
 #define DRV_NAME "pata_falcon"
 #define DRV_VERSION "0.1.0"
 
-static struct scsi_host_template pata_falcon_sht = {
+static const struct scsi_host_template pata_falcon_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 88924b5daa1adbf6fdbbf50baff38f501bf3ac81..6f6734c09b1115c6176779d8526008c3b183420a 100644 (file)
@@ -84,7 +84,7 @@ struct ftide010 {
 #define FTIDE010_CLK_MOD_DEV0_UDMA_EN  BIT(4)
 #define FTIDE010_CLK_MOD_DEV1_UDMA_EN  BIT(5)
 
-static struct scsi_host_template pata_ftide010_sht = {
+static const struct scsi_host_template pata_ftide010_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 65bc9f3042ce20a97203fb77c9c415dbadd994fa..e5aa07f92106547e202ee94cd598f9c780ca01a3 100644 (file)
@@ -35,7 +35,7 @@
 
 #define GAYLE_CONTROL  0x101a
 
-static struct scsi_host_template pata_gayle_sht = {
+static const struct scsi_host_template pata_gayle_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 7e441fb304d3c4decf220e325d67e540c50a4d47..bdccd1ba152471995b311b9c9865c5475a7b56e3 100644 (file)
@@ -312,7 +312,7 @@ static int hpt366_prereset(struct ata_link *link, unsigned long deadline)
        return ata_sff_prereset(link, deadline);
 }
 
-static struct scsi_host_template hpt36x_sht = {
+static const struct scsi_host_template hpt36x_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index ce3c5eaa7e767619fbb6353664fea767d84c044b..c0329cf01135f68d8900eef59fb8642b595832ef 100644 (file)
@@ -526,7 +526,7 @@ static void hpt37x_bmdma_stop(struct ata_queued_cmd *qc)
 }
 
 
-static struct scsi_host_template hpt37x_sht = {
+static const struct scsi_host_template hpt37x_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 617c95522f43b291b4bbce01ae4303f1ff2b1b7b..5b1ecccf3c8388aaaf51768e79f71982e9a9ea93 100644 (file)
@@ -337,7 +337,7 @@ static unsigned int hpt3x2n_qc_issue(struct ata_queued_cmd *qc)
        return ata_bmdma_qc_issue(qc);
 }
 
-static struct scsi_host_template hpt3x2n_sht = {
+static const struct scsi_host_template hpt3x2n_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 83974d5eb3871d15a6eb9a5513a6efb3d003a220..d65c586b5ad00c87a15f9a28aa32a414ef29de8f 100644 (file)
@@ -136,7 +136,7 @@ static int hpt3x3_atapi_dma(struct ata_queued_cmd *qc)
 
 #endif /* CONFIG_PATA_HPT3X3_DMA */
 
-static struct scsi_host_template hpt3x3_sht = {
+static const struct scsi_host_template hpt3x3_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 498383cb6e293939204a037040f1936562101735..9cfb064782c3c93e0a6d1845a95220076507d1df 100644 (file)
@@ -298,7 +298,7 @@ static int icside_dma_init(struct pata_icside_info *info)
 }
 
 
-static struct scsi_host_template pata_icside_sht = {
+static const struct scsi_host_template pata_icside_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = SG_MAX_SEGMENTS,
        .dma_boundary           = IOMD_DMA_BOUNDARY,
index 150939275b1b9411df3a0068c66e0f9035f4330f..4013f28679a9b548cc6c96b21a7a8e38da31acae 100644 (file)
@@ -97,7 +97,7 @@ static void pata_imx_set_piomode(struct ata_port *ap, struct ata_device *adev)
        __raw_writel(val, priv->host_regs + PATA_IMX_ATA_CONTROL);
 }
 
-static struct scsi_host_template pata_imx_sht = {
+static const struct scsi_host_template pata_imx_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 43bb224430d3cec4bac2b1aa80d8035c5b70858a..25a63d043c8e1f442001304b5aef2606f0c7ac17 100644 (file)
@@ -20,7 +20,7 @@
 #define DRV_NAME "pata_isapnp"
 #define DRV_VERSION "0.2.5"
 
-static struct scsi_host_template isapnp_sht = {
+static const struct scsi_host_template isapnp_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 8a3e8778163cec4fb9f40f7ddcd695d7fee97fad..b7ac56103c8a3fa565668efcef84bc05f97ce811 100644 (file)
@@ -228,7 +228,7 @@ static void it8213_set_dmamode (struct ata_port *ap, struct ata_device *adev)
        pci_write_config_byte(dev, 0x48, udma_enable);
 }
 
-static struct scsi_host_template it8213_sht = {
+static const struct scsi_host_template it8213_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 8a5b4e0079abf5ea734af40afecc5d1cde1c3557..2fe3fb6102ce6a939c32f77c1f6614fbd0c777b0 100644 (file)
@@ -800,7 +800,7 @@ static int it821x_rdc_cable(struct ata_port *ap)
        return ATA_CBL_PATA80;
 }
 
-static struct scsi_host_template it821x_sht = {
+static const struct scsi_host_template it821x_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index e225913a619d8414be59e9ff00c7e78c98dbc244..9a2c1b6cd71fbd3be4f23605919a3a374adf943c 100644 (file)
@@ -173,7 +173,7 @@ static unsigned int ixp4xx_mmio_data_xfer(struct ata_queued_cmd *qc,
        return words << 1;
 }
 
-static struct scsi_host_template ixp4xx_sht = {
+static const struct scsi_host_template ixp4xx_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index d1b3ce8958ddc8ac32dcdd45fa2123881af5add9..f51fb821976245c9bea4465d0ffb9fc4713316d9 100644 (file)
@@ -107,7 +107,7 @@ static int jmicron_pre_reset(struct ata_link *link, unsigned long deadline)
 
 /* No PIO or DMA methods needed for this device */
 
-static struct scsi_host_template jmicron_sht = {
+static const struct scsi_host_template jmicron_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 03c580625c2cc7c1d5ce0b905caf7190e989410a..448a511cbc179aaaf694839be4e67ef671cc7e9a 100644 (file)
@@ -250,7 +250,7 @@ static int legacy_set_mode(struct ata_link *link, struct ata_device **unused)
        return 0;
 }
 
-static struct scsi_host_template legacy_sht = {
+static const struct scsi_host_template legacy_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 9ccaac9e2bc319cdb02fd882d23a9e4d5b730bd9..c4d86ea049f0519461ca0b3e726b75747ef776ae 100644 (file)
@@ -908,7 +908,7 @@ static int pata_macio_do_resume(struct pata_macio_priv *priv)
 }
 #endif /* CONFIG_PM_SLEEP */
 
-static struct scsi_host_template pata_macio_sht = {
+static const struct scsi_host_template pata_macio_sht = {
        __ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = MAX_DCMDS,
        /* We may not need that strict one */
index 014ccb0f45dc4628f8422d079f31727759c3537c..8119caaad6055fb0bd2f2ae190c402a3ecbf6508 100644 (file)
@@ -92,7 +92,7 @@ static int marvell_cable_detect(struct ata_port *ap)
 
 /* No PIO or DMA methods needed for this device */
 
-static struct scsi_host_template marvell_sht = {
+static const struct scsi_host_template marvell_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 3ebd6522a1fd1905963088a310a425c2ec8c2516..66c9dea4ea6eeff1af6e35d3495e65696b832a84 100644 (file)
@@ -606,7 +606,7 @@ mpc52xx_ata_task_irq(int irq, void *vpriv)
        return IRQ_HANDLED;
 }
 
-static struct scsi_host_template mpc52xx_ata_sht = {
+static const struct scsi_host_template mpc52xx_ata_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 8fda0e32c1ab217fd07756ce3922c297e2b050c5..69e4baf27d72836ccb7c253b955f1baae1715531 100644 (file)
@@ -136,7 +136,7 @@ static unsigned int mpiix_qc_issue(struct ata_queued_cmd *qc)
        return ata_sff_qc_issue(qc);
 }
 
-static struct scsi_host_template mpiix_sht = {
+static const struct scsi_host_template mpiix_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 06929e77c4915eb0c35d575467bc49cc5db04ec1..c0b2897fcf40d12e31d1f8cfb99d07456b558bfe 100644 (file)
@@ -31,7 +31,7 @@ static unsigned int netcell_read_id(struct ata_device *adev,
        return err_mask;
 }
 
-static struct scsi_host_template netcell_sht = {
+static const struct scsi_host_template netcell_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index f9255d6fd19406b8c009e0ca8ec2596decc818bb..76a91013d27d0c26bfd789d05069a52acbd1e810 100644 (file)
@@ -77,7 +77,7 @@ static void ninja32_dev_select(struct ata_port *ap, unsigned int device)
        }
 }
 
-static struct scsi_host_template ninja32_sht = {
+static const struct scsi_host_template ninja32_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index ca3ab2736fef88655fb312f25c115c3343ae0b07..44cc24d21d5f07c2c8691b7b0e369dd30101408b 100644 (file)
@@ -114,7 +114,7 @@ static unsigned int ns87410_qc_issue(struct ata_queued_cmd *qc)
        return ata_sff_qc_issue(qc);
 }
 
-static struct scsi_host_template ns87410_sht = {
+static const struct scsi_host_template ns87410_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 9dd6bffefb485cf412c769a658670c76c7520d86..d60e1f69d7b02fb2bb4625fb36f246c01371ff6f 100644 (file)
@@ -320,7 +320,7 @@ static struct ata_port_operations ns87560_pata_ops = {
 };
 #endif
 
-static struct scsi_host_template ns87415_sht = {
+static const struct scsi_host_template ns87415_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 4cbcdc5da0383284848f6685e70e03824f466e7d..b1ce9f1761af545ff2e39213b69d67603a5d0e39 100644 (file)
@@ -58,7 +58,7 @@ struct octeon_cf_port {
        u64 dma_base;
 };
 
-static struct scsi_host_template octeon_cf_sht = {
+static const struct scsi_host_template octeon_cf_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index ac5a633c00a57ac1f1828f6e4499dca53870c267..178b28eff170a97f3c1190f432b8e54a465ecafb 100644 (file)
@@ -15,7 +15,7 @@
 
 #define DRV_NAME "pata_of_platform"
 
-static struct scsi_host_template pata_platform_sht = {
+static const struct scsi_host_template pata_platform_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 22a0203744108f1b8bb5cd8580ac78241702e6a3..dca82d92b004f3d7c32f31ac78ef54949c1b272d 100644 (file)
@@ -204,7 +204,7 @@ static unsigned int oldpiix_qc_issue(struct ata_queued_cmd *qc)
 }
 
 
-static struct scsi_host_template oldpiix_sht = {
+static const struct scsi_host_template oldpiix_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 01976c4e40330aa8791d495c669d9f411e09f429..3d23f57eb1289ce05275e8d9823b60a46eb6ffdd 100644 (file)
@@ -148,7 +148,7 @@ static void opti_set_piomode(struct ata_port *ap, struct ata_device *adev)
        opti_write_reg(ap, 0x85, CNTRL_REG);
 }
 
-static struct scsi_host_template opti_sht = {
+static const struct scsi_host_template opti_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index ad1090b90e52ffa128a5fe0464e33b96a4eacc60..dfc36b4ec9c6b08087a4f62e960c799ad3496a6a 100644 (file)
@@ -334,7 +334,7 @@ static int optidma_set_mode(struct ata_link *link, struct ata_device **r_failed)
        return rc;
 }
 
-static struct scsi_host_template optidma_sht = {
+static const struct scsi_host_template optidma_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 294a266a0dda579c58475678ade746f2e2c723ff..02a62310845ac0ca09e64199d886108322f90284 100644 (file)
@@ -398,7 +398,7 @@ static struct device pata_parport_bus = {
        .release = pata_parport_bus_release,
 };
 
-static struct scsi_host_template pata_parport_sht = {
+static const struct scsi_host_template pata_parport_sht = {
        PATA_PARPORT_SHT("pata_parport")
 };
 
index 8eb066abbd9cf9ec03cc4959b0d6784c12796d23..5b602206c52285e166e332404eaf5e6959c52dcd 100644 (file)
@@ -132,7 +132,7 @@ static void pcmcia_8bit_drain_fifo(struct ata_queued_cmd *qc)
 
 }
 
-static struct scsi_host_template pcmcia_sht = {
+static const struct scsi_host_template pcmcia_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index 4191aa61c8e4fbe97c16d63f565f49a436be35df..6820c5597b14580cbec11f619c691e0da71582bb 100644 (file)
@@ -122,7 +122,7 @@ static struct pci_driver pdc2027x_pci_driver = {
 #endif
 };
 
-static struct scsi_host_template pdc2027x_sht = {
+static const struct scsi_host_template pdc2027x_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index f894ff2de0a97178157b977869d125ca2305e522..a32723e46357da66cc208dd65ef394d0b4e4a558 100644 (file)
@@ -289,7 +289,7 @@ static int pdc2026x_check_atapi_dma(struct ata_queued_cmd *qc)
        return 1;
 }
 
-static struct scsi_host_template pdc202xx_sht = {
+static const struct scsi_host_template pdc202xx_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 389b63b13c7066267fae747509dcd352f0a92d0f..ced906bf56be1926f58a1f49907303d75ab9572c 100644 (file)
@@ -62,7 +62,7 @@ static void tosh_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 }
 
 
-static struct scsi_host_template tosh_sht = {
+static const struct scsi_host_template tosh_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 21fb059859bdd240c1d339b5754036270b5a434b..87479bc893b252622d5f5b4a0761a09a3adb6d93 100644 (file)
@@ -45,7 +45,7 @@ static int pata_platform_set_mode(struct ata_link *link, struct ata_device **unu
        return 0;
 }
 
-static struct scsi_host_template pata_platform_sht = {
+static const struct scsi_host_template pata_platform_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
@@ -97,7 +97,7 @@ static void pata_platform_setup_port(struct ata_ioports *ioaddr,
 int __pata_platform_probe(struct device *dev, struct resource *io_res,
                          struct resource *ctl_res, struct resource *irq_res,
                          unsigned int ioport_shift, int __pio_mask,
-                         struct scsi_host_template *sht, bool use16bit)
+                         const struct scsi_host_template *sht, bool use16bit)
 {
        struct ata_host *host;
        struct ata_port *ap;
index 985f42c4fd700eb26f3ac5c9296ebf7bba712d2c..ea402e02c46e25d16dfdb1d36d0d3028369507b4 100644 (file)
@@ -136,7 +136,7 @@ static int pxa_check_atapi_dma(struct ata_queued_cmd *qc)
        return -EOPNOTSUPP;
 }
 
-static struct scsi_host_template pxa_ata_sht = {
+static const struct scsi_host_template pxa_ata_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 3aca8fe3fdb67bbb6697b1c342d55c0baa7bb261..84b001097093796545c953ec2b4cadf1eeae49e6 100644 (file)
@@ -183,7 +183,7 @@ static unsigned int radisys_qc_issue(struct ata_queued_cmd *qc)
 }
 
 
-static struct scsi_host_template radisys_sht = {
+static const struct scsi_host_template radisys_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 2e110aefe59b71916fada46367d624a6e28ddb68..3974d294a341b1da85c85f4daece3ce7513b1ebb 100644 (file)
@@ -73,7 +73,7 @@ static struct ata_port_operations rb532_pata_port_ops = {
 
 /* ------------------------------------------------------------------------ */
 
-static struct scsi_host_template rb532_pata_sht = {
+static const struct scsi_host_template rb532_pata_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index ecb229c2c1a2d76a9fc10fefb7b1c399cf4a7e97..0a9689862f7109e856e427112c8212ab95a3f77f 100644 (file)
@@ -288,7 +288,7 @@ static const struct ata_port_info rdc_port_info = {
        .port_ops       = &rdc_pata_ops,
 };
 
-static struct scsi_host_template rdc_sht = {
+static const struct scsi_host_template rdc_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index fb00c3e5fd195399ab48227b00e6aa10b7cb0c69..8e26067930912b64f0d3e68c1553e8e41e05cea1 100644 (file)
@@ -50,7 +50,7 @@ static int rz1000_set_mode(struct ata_link *link, struct ata_device **unused)
 }
 
 
-static struct scsi_host_template rz1000_sht = {
+static const struct scsi_host_template rz1000_sht = {
        ATA_PIO_SHT(DRV_NAME),
 };
 
index f28daf62a37df0a040ecc70d9ec51711b1208711..a388dfb97ad8c36413aedada2aac5881fdc95169 100644 (file)
@@ -192,7 +192,7 @@ static int sc1200_qc_defer(struct ata_queued_cmd *qc)
        return 0;
 }
 
-static struct scsi_host_template sc1200_sht = {
+static const struct scsi_host_template sc1200_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize   = LIBATA_DUMB_MAX_PRD,
        .dma_boundary   = ATA_DMA_BOUNDARY,
index 4f9c2aefd807c466b70bee989879bbc25595f9b4..8356f1f2a025a2da89ecec2b7c82dcc7f534ec04 100644 (file)
@@ -57,7 +57,7 @@ static struct pci_driver sch_pci_driver = {
 #endif
 };
 
-static struct scsi_host_template sch_sht = {
+static const struct scsi_host_template sch_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index c0bc4af0d1960c28d7278e77cdfef7eabf481bee..549ff24a98231186f6eb9b56d27eba2eab26bd90 100644 (file)
@@ -252,13 +252,13 @@ static void serverworks_set_dmamode(struct ata_port *ap, struct ata_device *adev
        pci_write_config_byte(pdev, 0x54, ultra_cfg);
 }
 
-static struct scsi_host_template serverworks_osb4_sht = {
+static const struct scsi_host_template serverworks_osb4_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize   = LIBATA_DUMB_MAX_PRD,
        .dma_boundary   = ATA_DMA_BOUNDARY,
 };
 
-static struct scsi_host_template serverworks_csb_sht = {
+static const struct scsi_host_template serverworks_csb_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
@@ -413,7 +413,7 @@ static int serverworks_init_one(struct pci_dev *pdev, const struct pci_device_id
                }
        };
        const struct ata_port_info *ppi[] = { &info[id->driver_data], NULL };
-       struct scsi_host_template *sht = &serverworks_csb_sht;
+       const struct scsi_host_template *sht = &serverworks_csb_sht;
        int rc;
 
        rc = pcim_enable_device(pdev);
index 67ef2e26d7df13d4246542caaf6b691122fc8295..abe64b5f83cf6f126a79853768b6f0da9f0af836 100644 (file)
@@ -223,7 +223,7 @@ static bool sil680_sff_irq_check(struct ata_port *ap)
        return val & 0x08;
 }
 
-static struct scsi_host_template sil680_sht = {
+static const struct scsi_host_template sil680_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 92e4cf05de2cd77995889dbb59cd08c50c037a57..31de06b66221056dfa9a4dda39a7bbf0d4f80d25 100644 (file)
@@ -539,7 +539,7 @@ static unsigned int sis_133_mode_filter(struct ata_device *adev, unsigned int ma
        return mask;
 }
 
-static struct scsi_host_template sis_sht = {
+static const struct scsi_host_template sis_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 8487470e2e01efb0b409183525d486686f3097f3..3b62ea482f1ab176019ab31ef57e11efd8d1d5af 100644 (file)
@@ -238,7 +238,7 @@ static bool sl82c105_sff_irq_check(struct ata_port *ap)
        return val & mask;
 }
 
-static struct scsi_host_template sl82c105_sht = {
+static const struct scsi_host_template sl82c105_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 782162d2f3f8f9009e2f8eab8d848b4b86c0fd45..26d448a869e2f403e70a3df49f982b6453df1401 100644 (file)
@@ -160,7 +160,7 @@ static void triflex_bmdma_stop(struct ata_queued_cmd *qc)
        triflex_load_timing(qc->ap, qc->dev, qc->dev->pio_mode);
 }
 
-static struct scsi_host_template triflex_sht = {
+static const struct scsi_host_template triflex_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 34f00f389932cf76864e885bfef537398d3d7c96..696b99720dcbdaa94cb6542b3fc62c398f8d2330 100644 (file)
@@ -443,7 +443,7 @@ static int via_port_start(struct ata_port *ap)
        return 0;
 }
 
-static struct scsi_host_template via_sht = {
+static const struct scsi_host_template via_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 35b823ac20c93cbdfc8b5db87baa74964b30d7cb..8e6b2599f0d53885de01d77069175a5578fa6cb4 100644 (file)
@@ -123,7 +123,7 @@ static void adma_freeze(struct ata_port *ap);
 static void adma_thaw(struct ata_port *ap);
 static int adma_prereset(struct ata_link *link, unsigned long deadline);
 
-static struct scsi_host_template adma_ata_sht = {
+static const struct scsi_host_template adma_ata_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = LIBATA_MAX_PRD,
        .dma_boundary           = ADMA_DMA_BOUNDARY,
index 21d77633a98f3e7bf795c4c11ab3cdfcc091627c..24334a8a3f0b4c27efc19c24dde6e09ade3fdf87 100644 (file)
@@ -1076,7 +1076,7 @@ static void sata_dwc_dev_select(struct ata_port *ap, unsigned int device)
 /*
  * scsi mid-layer and libata interface structures
  */
-static struct scsi_host_template sata_dwc_sht = {
+static const struct scsi_host_template sata_dwc_sht = {
        ATA_NCQ_SHT(DRV_NAME),
        /*
         * test-only: Currently this driver doesn't handle NCQ
index b052c5a65c176114a428b42c923e1ef348225fc7..ccd99b9aa9ff70cf131d9825926c8ef06d587dbd 100644 (file)
@@ -1376,7 +1376,7 @@ static void sata_fsl_host_stop(struct ata_host *host)
 /*
  * scsi mid-layer and libata interface structures
  */
-static struct scsi_host_template sata_fsl_sht = {
+static const struct scsi_host_template sata_fsl_sht = {
        ATA_NCQ_SHT_QD("sata_fsl", SATA_FSL_QUEUE_DEPTH),
        .sg_tablesize = SATA_FSL_MAX_PRD_USABLE,
        .dma_boundary = ATA_DMA_BOUNDARY,
index dfbf9493e45194b7dbf3f38fa702af1bb981da0f..8237ece4a46fee455ce4e42e988e7768952155f3 100644 (file)
@@ -438,7 +438,7 @@ static const struct ata_port_info ahci_highbank_port_info = {
        .port_ops       = &ahci_highbank_ops,
 };
 
-static struct scsi_host_template ahci_highbank_platform_sht = {
+static const struct scsi_host_template ahci_highbank_platform_sht = {
        AHCI_SHT("sata_highbank"),
 };
 
index 2833c722118d8cce82000cf4a8b2a0332ccde262..2c8c78ed86c199799969994b34bbb603d9b3a235 100644 (file)
@@ -242,7 +242,7 @@ struct inic_port_priv {
        dma_addr_t      cpb_tbl_dma;
 };
 
-static struct scsi_host_template inic_sht = {
+static const struct scsi_host_template inic_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = LIBATA_MAX_PRD, /* maybe it can be larger? */
 
index e3cff01201b8052548c86d804d394e0d6f237480..d404e631d1527431bb53472f0f67cda7c9dbc1e1 100644 (file)
@@ -659,13 +659,13 @@ static u8 mv_sff_check_status(struct ata_port *ap);
  * PRDs for 64K boundaries in mv_fill_sg().
  */
 #ifdef CONFIG_PCI
-static struct scsi_host_template mv5_sht = {
+static const struct scsi_host_template mv5_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = MV_MAX_SG_CT / 2,
        .dma_boundary           = MV_DMA_BOUNDARY,
 };
 #endif
-static struct scsi_host_template mv6_sht = {
+static const struct scsi_host_template mv6_sht = {
        __ATA_BASE_SHT(DRV_NAME),
        .can_queue              = MV_MAX_Q_DEPTH - 1,
        .sg_tablesize           = MV_MAX_SG_CT / 2,
index 9b2d289e89e1f0510100a3850392a6a589780344..abf5651c87ab45c77499c886f26aa5808a2eb011 100644 (file)
@@ -371,11 +371,11 @@ static struct pci_driver nv_pci_driver = {
        .remove                 = ata_pci_remove_one,
 };
 
-static struct scsi_host_template nv_sht = {
+static const struct scsi_host_template nv_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
-static struct scsi_host_template nv_adma_sht = {
+static const struct scsi_host_template nv_adma_sht = {
        __ATA_BASE_SHT(DRV_NAME),
        .can_queue              = NV_ADMA_MAX_CPBS,
        .sg_tablesize           = NV_ADMA_SGTBL_TOTAL_LEN,
@@ -386,7 +386,7 @@ static struct scsi_host_template nv_adma_sht = {
        .tag_alloc_policy       = BLK_TAG_ALLOC_RR,
 };
 
-static struct scsi_host_template nv_swncq_sht = {
+static const struct scsi_host_template nv_swncq_sht = {
        __ATA_BASE_SHT(DRV_NAME),
        .can_queue              = ATA_MAX_QUEUE - 1,
        .sg_tablesize           = LIBATA_MAX_PRD,
@@ -520,7 +520,7 @@ static struct ata_port_operations nv_swncq_ops = {
 
 struct nv_pi_priv {
        irq_handler_t                   irq_handler;
-       struct scsi_host_template       *sht;
+       const struct scsi_host_template *sht;
 };
 
 #define NV_PI_PRIV(_irq_handler, _sht) \
index 4e60e6c4c35a77618531bee8f2d9bab5b38476dd..2df1a070b25a9edbddbdad327dd70e410da05353 100644 (file)
@@ -158,7 +158,7 @@ static void pdc_error_handler(struct ata_port *ap);
 static void pdc_post_internal_cmd(struct ata_queued_cmd *qc);
 static int pdc_pata_cable_detect(struct ata_port *ap);
 
-static struct scsi_host_template pdc_ata_sht = {
+static const struct scsi_host_template pdc_ata_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = PDC_MAX_PRD,
        .dma_boundary           = ATA_DMA_BOUNDARY,
index 8ca0810aad26c669a64bf458dbb023133339557e..8a62861590441f0c7d01a3cfe0b3c19d223715e1 100644 (file)
@@ -108,7 +108,7 @@ static void qs_thaw(struct ata_port *ap);
 static int qs_prereset(struct ata_link *link, unsigned long deadline);
 static void qs_error_handler(struct ata_port *ap);
 
-static struct scsi_host_template qs_ata_sht = {
+static const struct scsi_host_template qs_ata_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = QS_MAX_PRD,
        .dma_boundary           = QS_DMA_BOUNDARY,
index 0195eb29f6c2de82a6439eaee4eabf1b85128a5e..34790f15c1b81fb5913cb033c4e6c929665befad 100644 (file)
@@ -608,7 +608,7 @@ static u8 sata_rcar_bmdma_status(struct ata_port *ap)
        return host_stat;
 }
 
-static struct scsi_host_template sata_rcar_sht = {
+static const struct scsi_host_template sata_rcar_sht = {
        ATA_BASE_SHT(DRV_NAME),
        /*
         * This controller allows transfer chunks up to 512MB which cross 64KB
index 3b989a52879d908620f6e5f46f981e11356d77e0..cc77c0248284314521199a988e4ea6dcec449bfe 100644 (file)
@@ -156,7 +156,7 @@ static struct pci_driver sil_pci_driver = {
 #endif
 };
 
-static struct scsi_host_template sil_sht = {
+static const struct scsi_host_template sil_sht = {
        ATA_BASE_SHT(DRV_NAME),
        /** These controllers support Large Block Transfer which allows
            transfer chunks up to 2GB and which cross 64KB boundaries,
index 22cc9e9789dd6d934b157aa95bceef5e3018a173..e72a0257990d884db06238a147f46c7695bd93b6 100644 (file)
@@ -373,7 +373,7 @@ static struct pci_driver sil24_pci_driver = {
 #endif
 };
 
-static struct scsi_host_template sil24_sht = {
+static const struct scsi_host_template sil24_sht = {
        __ATA_BASE_SHT(DRV_NAME),
        .can_queue              = SIL24_MAX_CMDS,
        .sg_tablesize           = SIL24_MAX_SGE,
index 316237362aa97fe78e37d478aa19ee0d1509e077..ef8724986de31b5e8db52e3822ae2a8928f76049 100644 (file)
@@ -72,7 +72,7 @@ static struct pci_driver sis_pci_driver = {
 #endif
 };
 
-static struct scsi_host_template sis_sht = {
+static const struct scsi_host_template sis_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 2e3418a82b445011a442eb6160d5108f53a40024..c47c3fb434d53fb5882f226bec0113a223099491 100644 (file)
@@ -330,7 +330,7 @@ static int k2_sata_show_info(struct seq_file *m, struct Scsi_Host *shost)
        return 0;
 }
 
-static struct scsi_host_template k2_sata_sht = {
+static const struct scsi_host_template k2_sata_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
        .show_info              = k2_sata_show_info,
 };
index a92c60455b1dbe21a6325b868b33076b5ae108ca..ccc0160726372cab28670eceaf3f4a01ec81fd07 100644 (file)
@@ -226,7 +226,7 @@ static void pdc_post_internal_cmd(struct ata_queued_cmd *qc);
 static int pdc_check_atapi_dma(struct ata_queued_cmd *qc);
 
 
-static struct scsi_host_template pdc_sata_sht = {
+static const struct scsi_host_template pdc_sata_sht = {
        ATA_BASE_SHT(DRV_NAME),
        .sg_tablesize           = LIBATA_MAX_PRD,
        .dma_boundary           = ATA_DMA_BOUNDARY,
index 815e6af753104a78c4af0287a08f9fe67bd06ad3..60ea45926cd1449cdf2ad46c7df7c6e49d507c66 100644 (file)
@@ -59,7 +59,7 @@ static struct pci_driver uli_pci_driver = {
        .remove                 = ata_pci_remove_one,
 };
 
-static struct scsi_host_template uli_sht = {
+static const struct scsi_host_template uli_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index c7891cc84ea0bb7d4d3da77d1026d04d22556fa5..57cbf2cef618f1e9fb72516ae3dcff2c7de44108 100644 (file)
@@ -107,7 +107,7 @@ static struct pci_driver svia_pci_driver = {
        .remove                 = ata_pci_remove_one,
 };
 
-static struct scsi_host_template svia_sht = {
+static const struct scsi_host_template svia_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 87e4ed66b30641df072d6b5e2ac859451505fce9..d39b875371682b8c0733cb00942f751346678d1b 100644 (file)
@@ -277,7 +277,7 @@ out:
 }
 
 
-static struct scsi_host_template vsc_sata_sht = {
+static const struct scsi_host_template vsc_sata_sht = {
        ATA_BMDMA_SHT(DRV_NAME),
 };
 
index 17fa26215292ecee26ab36c6afef8bca15519f93..fe0760ce34c86297a6b44f4a5a65ca18b82264de 100644 (file)
@@ -37,7 +37,7 @@ struct ahci_host_priv *ahci_platform_get_resources(
 int ahci_platform_init_host(struct platform_device *pdev,
                            struct ahci_host_priv *hpriv,
                            const struct ata_port_info *pi_template,
-                           struct scsi_host_template *sht);
+                           const struct scsi_host_template *sht);
 
 void ahci_platform_shutdown(struct platform_device *pdev);
 
index 9cafec92282db8516ec606f650e9a6eb37a7010d..b9745cc08e3825d39bd3070237088310f77457ba 100644 (file)
@@ -19,7 +19,7 @@ extern int __pata_platform_probe(struct device *dev,
                                 struct resource *irq_res,
                                 unsigned int ioport_shift,
                                 int __pio_mask,
-                                struct scsi_host_template *sht,
+                                const struct scsi_host_template *sht,
                                 bool use16bit);
 
 /*
index a759dfbdcc91a2ad78c96e80e7036403d016d5cc..311cd93377c75e20a80a3dbe48f60d3453b940a3 100644 (file)
@@ -1065,10 +1065,10 @@ extern void ata_host_get(struct ata_host *host);
 extern void ata_host_put(struct ata_host *host);
 extern int ata_host_start(struct ata_host *host);
 extern int ata_host_register(struct ata_host *host,
-                            struct scsi_host_template *sht);
+                            const struct scsi_host_template *sht);
 extern int ata_host_activate(struct ata_host *host, int irq,
                             irq_handler_t irq_handler, unsigned long irq_flags,
-                            struct scsi_host_template *sht);
+                            const struct scsi_host_template *sht);
 extern void ata_host_detach(struct ata_host *host);
 extern void ata_host_init(struct ata_host *, struct device *, struct ata_port_operations *);
 extern int ata_scsi_detect(struct scsi_host_template *sht);
@@ -1980,10 +1980,10 @@ extern int ata_pci_sff_prepare_host(struct pci_dev *pdev,
                                    struct ata_host **r_host);
 extern int ata_pci_sff_activate_host(struct ata_host *host,
                                     irq_handler_t irq_handler,
-                                    struct scsi_host_template *sht);
+                                    const struct scsi_host_template *sht);
 extern int ata_pci_sff_init_one(struct pci_dev *pdev,
                const struct ata_port_info * const * ppi,
-               struct scsi_host_template *sht, void *host_priv, int hflags);
+               const struct scsi_host_template *sht, void *host_priv, int hflags);
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ATA_BMDMA
@@ -2019,7 +2019,7 @@ extern int ata_pci_bmdma_prepare_host(struct pci_dev *pdev,
                                      struct ata_host **r_host);
 extern int ata_pci_bmdma_init_one(struct pci_dev *pdev,
                                  const struct ata_port_info * const * ppi,
-                                 struct scsi_host_template *sht,
+                                 const struct scsi_host_template *sht,
                                  void *host_priv, int hflags);
 #endif /* CONFIG_PCI */
 #endif /* CONFIG_ATA_BMDMA */