Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9f36917 authored by Kefeng Wang's avatar Kefeng Wang Committed by Tejun Heo
Browse files

libahci_platform: add host_flags parameter in ahci_platform_init_host() 



Add a dynamic host_flags argument to make ahci_platform_init_host more flexible,
then remove the AHCI_HFLAGS(...) argument from some driver's ata_port_info,
and pass that in as the new argument.

Cc: Hans de Geode <hdegoede@redhat.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarKefeng Wang <kefeng.wang@linaro.org>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent 888d91a0

drivers/ata/ahci_da850.c

+2 −1
Original line number Diff line number Diff line
@@ -85,7 +85,8 @@ static int ahci_da850_probe(struct platform_device *pdev) 


	da850_sata_init(dev, pwrdn_reg, hpriv->mmio);



	rc = ahci_platform_init_host(pdev, hpriv, &ahci_da850_port_info, 0, 0);

	rc = ahci_platform_init_host(pdev, hpriv, &ahci_da850_port_info,

				     0, 0, 0);

	if (rc)

		goto disable_resources;

drivers/ata/ahci_imx.c

+2 −1
Original line number Diff line number Diff line
@@ -267,7 +267,8 @@ static int imx_ahci_probe(struct platform_device *pdev) 
	reg_val = clk_get_rate(imxpriv->ahb_clk) / 1000;

	writel(reg_val, hpriv->mmio + HOST_TIMER1MS);



	ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info, 0, 0);

	ret = ahci_platform_init_host(pdev, hpriv, &ahci_imx_port_info,

				      0, 0, 0);

	if (ret)

		imx_sata_disable(hpriv);

drivers/ata/ahci_mvebu.c

+2 −1
Original line number Diff line number Diff line
@@ -88,7 +88,8 @@ static int ahci_mvebu_probe(struct platform_device *pdev) 
	ahci_mvebu_mbus_config(hpriv, dram);

	ahci_mvebu_regret_option(hpriv);



	rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, 0, 0);

	rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info,

				     0, 0, 0);

	if (rc)

		goto disable_resources;

drivers/ata/ahci_platform.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static int ahci_probe(struct platform_device *pdev) 
			goto disable_resources;

	}



	rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0);

	rc = ahci_platform_init_host(pdev, hpriv, &ahci_port_info, 0, 0, 0);

	if (rc)

		goto pdata_exit;

drivers/ata/ahci_st.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static int st_ahci_probe(struct platform_device *pdev) 
	if (err)

		return err;



	err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info, 0, 0);

	err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info, 0, 0, 0);

	if (err) {

		ahci_platform_disable_resources(hpriv);

		return err;