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

Commit a77b6ee9 authored by Suman Tripathi's avatar Suman Tripathi Committed by Tejun Heo
Browse files

ahci_xgene: Fix the error print invalid resource for APM X-Gene SoC AHCI SATA... 


ahci_xgene: Fix the error print invalid resource for APM X-Gene SoC AHCI SATA Host Controller driver.

This patch fixes the error print invalid resource for the APM X-Gene
SoC AHCI SATA Host Controller driver. This print was due to the fact
that the controller 3 don't have a mux resource. This didn't result
in any errors but the print seems like meaningless.

Signed-off-by: default avatarLoc Ho <lho@apm.com>
Signed-off-by: default avatarSuman Tripathi <stripathi@apm.com>
Signed-off-by: default avatarTejun Heo <tj@kernel.org>
parent d7bead1b

drivers/ata/ahci_xgene.c

+8 −2
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static int xgene_ahci_mux_select(struct xgene_ahci_context *ctx) 
	u32 val;



	/* Check for optional MUX resource */

	if (IS_ERR(ctx->csr_mux))

	if (!ctx->csr_mux)

		return 0;



	val = readl(ctx->csr_mux + SATA_ENET_CONFIG_REG);
@@ -456,7 +456,13 @@ static int xgene_ahci_probe(struct platform_device *pdev) 


	/* Retrieve the optional IP mux resource */

	res = platform_get_resource(pdev, IORESOURCE_MEM, 4);

	ctx->csr_mux = devm_ioremap_resource(dev, res);

	if (res) {

		void __iomem *csr = devm_ioremap_resource(dev, res);

		if (IS_ERR(csr))

			return PTR_ERR(csr);



		ctx->csr_mux = csr;

	}



	dev_dbg(dev, "VAddr 0x%p Mmio VAddr 0x%p\n", ctx->csr_core,

		hpriv->mmio);