[PATCH v2] ALSA: emu10k1: Stop using iommu_present()
iommu_get_domain_for_dev() is already perfectly happy to return NULL if the given device has no IOMMU. Drop the unnecessary check in favour of just handling that condition appropriately.
Signed-off-by: Robin Murphy robin.murphy@arm.com ---
v2: Get "!domain" condition right
sound/pci/emu10k1/emu10k1_main.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 86cc1ca025e4..3880f359e688 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -1751,11 +1751,8 @@ static void snd_emu10k1_detect_iommu(struct snd_emu10k1 *emu)
emu->iommu_workaround = false;
- if (!iommu_present(emu->card->dev->bus)) - return; - domain = iommu_get_domain_for_dev(emu->card->dev); - if (domain && domain->type == IOMMU_DOMAIN_IDENTITY) + if (!domain || domain->type == IOMMU_DOMAIN_IDENTITY) return;
dev_notice(emu->card->dev,
On Tue, 05 Apr 2022 15:27:54 +0200, Robin Murphy wrote:
iommu_get_domain_for_dev() is already perfectly happy to return NULL if the given device has no IOMMU. Drop the unnecessary check in favour of just handling that condition appropriately.
Signed-off-by: Robin Murphy robin.murphy@arm.com
v2: Get "!domain" condition right
Applied now. Thanks.
Takashi
participants (2)
-
Robin Murphy
-
Takashi Iwai