Commit c7b00652 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'ata-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata 

Pull ata fixes from Damien Le Moal:
 "Several minor fixes:

   - Fix the module alias for the ahci_imx driver to get autoloading to
     work (Alexander)

   - Fix a potential array-index-out-of-bounds problem with the
     enclosure managment support in the ahci driver (Kai-Heng)

   - Several patches to fix compilation warnings thrown by clang in the
     ahci_st, sata_rcar, ahci_brcm, ahci_xgene, ahci_imx and ahci_qoriq
     drivers (me)"

* tag 'ata-6.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata:
  ata: ahci_qoriq: Fix compilation warning
  ata: ahci_imx: Fix compilation warning
  ata: ahci_xgene: Fix compilation warning
  ata: ahci_brcm: Fix compilation warning
  ata: sata_rcar: Fix compilation warning
  ata: ahci_st: Fix compilation warning
  ata: ahci: Match EM_MAX_SLOTS with SATA_PMP_MAX_PORTS
  ata: ahci-imx: Fix MODULE_ALIAS
parents a3ccea6e 2ce3a0bf

drivers/ata/ahci.h

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ enum { 
	PCS_7				= 0x94, /* 7+ port PCS (Denverton) */



	/* em constants */

	EM_MAX_SLOTS			= 8,

	EM_MAX_SLOTS			= SATA_PMP_MAX_PORTS,

	EM_MAX_RETRY			= 5,



	/* em_ctl bits */

drivers/ata/ahci_brcm.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static int brcm_ahci_probe(struct platform_device *pdev) 
	if (!of_id)

		return -ENODEV;



	priv->version = (enum brcm_ahci_version)of_id->data;

	priv->version = (unsigned long)of_id->data;

	priv->dev = dev;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "top-ctrl");

drivers/ata/ahci_imx.c

+2 −2
Original line number Diff line number Diff line
@@ -1067,7 +1067,7 @@ static int imx_ahci_probe(struct platform_device *pdev) 
	imxpriv->ahci_pdev = pdev;

	imxpriv->no_device = false;

	imxpriv->first_time = true;

	imxpriv->type = (enum ahci_imx_type)of_id->data;

	imxpriv->type = (unsigned long)of_id->data;



	imxpriv->sata_clk = devm_clk_get(dev, "sata");

	if (IS_ERR(imxpriv->sata_clk)) {
@@ -1235,4 +1235,4 @@ module_platform_driver(imx_ahci_driver); 
MODULE_DESCRIPTION("Freescale i.MX AHCI SATA platform driver");

MODULE_AUTHOR("Richard Zhu <Hong-Xing.Zhu@freescale.com>");

MODULE_LICENSE("GPL");

MODULE_ALIAS("ahci:imx");
 
MODULE_ALIAS("platform:" DRV_NAME);

drivers/ata/ahci_qoriq.c

+1 −1
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static int ahci_qoriq_probe(struct platform_device *pdev) 
		return -ENOMEM;



	if (of_id)

		qoriq_priv->type = (enum ahci_qoriq_type)of_id->data;

		qoriq_priv->type = (unsigned long)of_id->data;

	else

		qoriq_priv->type = (enum ahci_qoriq_type)acpi_id->driver_data;

drivers/ata/ahci_st.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ static struct platform_driver st_ahci_driver = { 
	.driver = {

		.name = DRV_NAME,

		.pm = &st_ahci_pm_ops,

		.of_match_table = of_match_ptr(st_ahci_match),

		.of_match_table = st_ahci_match,

	},

	.probe = st_ahci_probe,

	.remove = ata_platform_remove_one,