Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 05:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCSI misc on 20230426

Browse Source 
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.
 
 Signed-off-by: James E.J. Bottomley <jejb@linux.ibm.com>
 -----BEGIN PGP SIGNATURE-----
 
 iJwEABMIAEQWIQTnYEDbdso9F2cI+arnQslM7pishQUCZEmJACYcamFtZXMuYm90
 dG9tbGV5QGhhbnNlbnBhcnRuZXJzaGlwLmNvbQAKCRDnQslM7pishU4FAP0WYhFC
 rkbY203/+ErUuwvOKum0VwJKUowCaUD0MBwScAD+Ok/NWobmjdXUBbPUbvVkr+hE
 8B/xs9hodX+1fVJcVG0=
 =fS/j
 -----END PGP SIGNATURE-----

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:
Linus Torvalds 2023-04-26 15:39:25 -07:00
commit b68ee1c613
317 changed files with 2271 additions and 1859 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/scsi/scsi_mid_low_api.rst
View File

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

2
drivers/ata/acard-ahci.c
View 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"),
};

2
drivers/ata/ahci.c
View 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"),
};

2
drivers/ata/ahci.h
View 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);

2
drivers/ata/ahci_brcm.c
View 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),
};

2
drivers/ata/ahci_ceva.c
View 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),
};

2
drivers/ata/ahci_da850.c
View 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),
};

2
drivers/ata/ahci_dm816.c
View 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),
};

2
drivers/ata/ahci_dwc.c
View 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),
};

2
drivers/ata/ahci_imx.c
View 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),
};

2
drivers/ata/ahci_mtk.c
View 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),
};

2
drivers/ata/ahci_mvebu.c
View 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),
};

2
drivers/ata/ahci_platform.c
View 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),
};

2
drivers/ata/ahci_qoriq.c
View 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),
};

2
drivers/ata/ahci_seattle.c
View 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),
};

2
drivers/ata/ahci_st.c
View 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),
};

2
drivers/ata/ahci_sunxi.c
View 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),
};

2
drivers/ata/ahci_tegra.c
View 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),
};

2
drivers/ata/ahci_xgene.c
View 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),
};

2
drivers/ata/ata_generic.c
View 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),
};

6
drivers/ata/ata_piix.c
View 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;

4
drivers/ata/libahci.c
View 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;

2
drivers/ata/libahci_platform.c
View 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;

4
drivers/ata/libata-core.c
View 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;

2
drivers/ata/libata-scsi.c
View 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;

8
drivers/ata/libata-sff.c
View 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);

2
drivers/ata/libata.h
View 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);

2
drivers/ata/pata_acpi.c
View 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),
};

2
drivers/ata/pata_ali.c
View 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),
};

2
drivers/ata/pata_amd.c
View 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),
};

2
drivers/ata/pata_arasan_cf.c
View 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,
};

2
drivers/ata/pata_artop.c
View 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),
};

2
drivers/ata/pata_atiixp.c
View 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,

2
drivers/ata/pata_atp867x.c
View 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),
};

2
drivers/ata/pata_buddha.c
View 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),
};

2
drivers/ata/pata_cmd640.c
View 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),
};

2
drivers/ata/pata_cmd64x.c
View 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),
};

2
drivers/ata/pata_cs5520.c
View 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,

2
drivers/ata/pata_cs5530.c
View 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,

2
drivers/ata/pata_cs5535.c
View 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),
};

2
drivers/ata/pata_cs5536.c
View 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),
};

2
drivers/ata/pata_cypress.c
View 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),
};

2
drivers/ata/pata_efar.c
View 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),
};

2
drivers/ata/pata_ep93xx.c
View 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,

2
drivers/ata/pata_falcon.c
View 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),
};

2
drivers/ata/pata_ftide010.c
View 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),
};

2
drivers/ata/pata_gayle.c
View 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),
};

2
drivers/ata/pata_hpt366.c
View 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),
};

2
drivers/ata/pata_hpt37x.c
View 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),
};

2
drivers/ata/pata_hpt3x2n.c
View 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),
};

2
drivers/ata/pata_hpt3x3.c
View 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),
};

2
drivers/ata/pata_icside.c
View 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,

2
drivers/ata/pata_imx.c
View 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),
};

2
drivers/ata/pata_isapnp.c
View 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),
};

2
drivers/ata/pata_it8213.c
View 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),
};

2
drivers/ata/pata_it821x.c
View 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),
};

2
drivers/ata/pata_ixp4xx_cf.c
View File

@ -174,7 +174,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),
};

2
drivers/ata/pata_jmicron.c
View 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),
};

2
drivers/ata/pata_legacy.c
View 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),
};

2
drivers/ata/pata_macio.c
View File

@ -909,7 +909,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 */

2
drivers/ata/pata_marvell.c
View 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),
};

2
drivers/ata/pata_mpc52xx.c
View 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),
};

2
drivers/ata/pata_mpiix.c
View 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),
};

2
drivers/ata/pata_netcell.c
View 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),
};

2
drivers/ata/pata_ninja32.c
View 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),
};

2
drivers/ata/pata_ns87410.c
View 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),
};

2
drivers/ata/pata_ns87415.c
View 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),
};

2
drivers/ata/pata_octeon_cf.c
View 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),
};

2
drivers/ata/pata_of_platform.c
View 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),
};

2
drivers/ata/pata_oldpiix.c
View 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),
};

2
drivers/ata/pata_opti.c
View 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),
};

2
drivers/ata/pata_optidma.c
View 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),
};

2
drivers/ata/pata_parport/pata_parport.c
View File

@ -399,7 +399,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")
};

2
drivers/ata/pata_pcmcia.c
View 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),
};

2
drivers/ata/pata_pdc2027x.c
View 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),
};

2
drivers/ata/pata_pdc202xx_old.c
View 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),
};

2
drivers/ata/pata_piccolo.c
View 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),
};

4
drivers/ata/pata_platform.c
View 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;

2
drivers/ata/pata_pxa.c
View 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),
};

2
drivers/ata/pata_radisys.c
View 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),
};

2
drivers/ata/pata_rb532_cf.c
View 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),
};

2
drivers/ata/pata_rdc.c
View 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),
};

2
drivers/ata/pata_rz1000.c
View 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),
};

2
drivers/ata/pata_sc1200.c
View 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,

2
drivers/ata/pata_sch.c
View 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),
};

6
drivers/ata/pata_serverworks.c
View 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);

2
drivers/ata/pata_sil680.c
View 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),
};

2
drivers/ata/pata_sis.c
View 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),
};

2
drivers/ata/pata_sl82c105.c
View 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),
};

2
drivers/ata/pata_triflex.c
View 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),
};

2
drivers/ata/pata_via.c
View 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),
};

2
drivers/ata/pdc_adma.c
View 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,

2
drivers/ata/sata_dwc_460ex.c
View 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

2
drivers/ata/sata_fsl.c
View 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,

2
drivers/ata/sata_highbank.c
View 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"),
};

2
drivers/ata/sata_inic162x.c
View 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? */

4
drivers/ata/sata_mv.c
View 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,

8
drivers/ata/sata_nv.c
View 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) \

2
drivers/ata/sata_promise.c
View 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,

2
drivers/ata/sata_qstor.c
View 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,

Some files were not shown because too many files have changed in this diff Show More