]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
tpm: Switch to platform_get_irq_optional()
authorHans de Goede <hdegoede@redhat.com>
Fri, 25 Oct 2019 09:14:48 +0000 (11:14 +0200)
committerJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tue, 12 Nov 2019 19:45:37 +0000 (21:45 +0200)
platform_get_irq() calls dev_err() on an error. As the IRQ usage in the
tpm_tis driver is optional, this is undesirable.

Specifically this leads to this new false-positive error being logged:
[    5.135413] tpm_tis MSFT0101:00: IRQ index 0 not found

This commit switches to platform_get_irq_optional(), which does not log
an error, fixing this.

Fixes: 7723f4c5ecdb ("driver core: platform: Add an error message to platform_get_irq*()"
Cc: <stable@vger.kernel.org> # 5.4.x
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Jerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
drivers/char/tpm/tpm_tis.c

index e4fdde93ed4cccf3bbaa125a71b72f19a3c42854..e7df342a317d6cf4be4f83e690af28b7d6be9c64 100644 (file)
@@ -286,7 +286,7 @@ static int tpm_tis_plat_probe(struct platform_device *pdev)
        }
        tpm_info.res = *res;
 
-       tpm_info.irq = platform_get_irq(pdev, 0);
+       tpm_info.irq = platform_get_irq_optional(pdev, 0);
        if (tpm_info.irq <= 0) {
                if (pdev != force_pdev)
                        tpm_info.irq = -1;