| From 7c7e470219500f7e1d76615d110db1bc85271726 Mon Sep 17 00:00:00 2001 |
| From: Hans de Goede <hdegoede@redhat.com> |
| Date: Fri, 25 Oct 2019 11:14:48 +0200 |
| Subject: [PATCH] tpm: Switch to platform_get_irq_optional() |
| |
| commit 9c8c5742b6af76a3fd93b4e56d1d981173cf9016 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c |
| index e4fdde93ed4c..e7df342a317d 100644 |
| --- a/drivers/char/tpm/tpm_tis.c |
| +++ b/drivers/char/tpm/tpm_tis.c |
| @@ -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; |
| -- |
| 2.7.4 |
| |
