mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-07 04:12:04 -04:00
tpm_tis: Use platform_get_irq
Replace the open coded IORESOURCE_IRQ with platform_get_irq, which
supports more cases.
Fixes: 00194826e6 ("tpm_tis: Clean up the force=1 module parameter")
Signed-off-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Reviewed-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Tested-by: Jerry Snitselaar <jsnitsel@redhat.com> (with TPM 2.0)
Tested-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> (with TPM 1.2)
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
This commit is contained in:
parent
d27f81f061
commit
fc0e132229
1 changed files with 2 additions and 4 deletions
|
|
@ -332,10 +332,8 @@ static int tpm_tis_plat_probe(struct platform_device *pdev)
|
|||
}
|
||||
tpm_info.res = *res;
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||
if (res) {
|
||||
tpm_info.irq = res->start;
|
||||
} else {
|
||||
tpm_info.irq = platform_get_irq(pdev, 0);
|
||||
if (tpm_info.irq <= 0) {
|
||||
if (pdev != force_pdev)
|
||||
tpm_info.irq = -1;
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in a new issue