Commit 87d04409 authored by Tom Lendacky's avatar Tom Lendacky Committed by Herbert Xu
Browse files

crypto: ccp - Fix device IRQ counting by using platform_irq_count() 



The ccp driver loops through the platform device resources array to get
the IRQ count for the device. With commit a1a2b712 ("of/platform: Drop
static setup of IRQ resource from DT core"), the IRQ resources are no
longer stored in the platform device resource array. As a result, the IRQ
count is now always zero. This causes the driver to issue a second call to
platform_get_irq(), which fails if the IRQ count is really 1, causing the
loading of the driver to fail.

Replace looping through the resources array to count the number of IRQs
with a call to platform_irq_count().

Fixes: a1a2b712 ("of/platform: Drop static setup of IRQ resource from DT core")
Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent abfed87e

drivers/crypto/ccp/sp-platform.c

+2 −10
Original line number Diff line number Diff line
@@ -85,17 +85,9 @@ static int sp_get_irqs(struct sp_device *sp) 
	struct sp_platform *sp_platform = sp->dev_specific;

	struct device *dev = sp->dev;

	struct platform_device *pdev = to_platform_device(dev);

	unsigned int i, count;

	int ret;



	for (i = 0, count = 0; i < pdev->num_resources; i++) {

		struct resource *res = &pdev->resource[i];



		if (resource_type(res) == IORESOURCE_IRQ)

			count++;

	}



	sp_platform->irq_count = count;

	sp_platform->irq_count = platform_irq_count(pdev);



	ret = platform_get_irq(pdev, 0);

	if (ret < 0) {
@@ -104,7 +96,7 @@ static int sp_get_irqs(struct sp_device *sp) 
	}



	sp->psp_irq = ret;

	if (count == 1) {

	if (sp_platform->irq_count == 1) {

		sp->ccp_irq = ret;

	} else {

		ret = platform_get_irq(pdev, 1);