From: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org
Cc: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>,
linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [PATCH 5/9] iommu/vt-d: Use BUG_ON instead of if () BUG()
Date: Thu, 13 Aug 2015 19:33:52 +0200 [thread overview]
Message-ID: <1439487236-14098-6-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1439487236-14098-1-git-send-email-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
From: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
Found by a coccicheck script.
Signed-off-by: Joerg Roedel <jroedel-l3A5Bk7waGM@public.gmane.org>
---
drivers/iommu/intel-iommu.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 8834765..2a7e017 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -4760,8 +4760,7 @@ static size_t intel_iommu_unmap(struct iommu_domain *domain,
/* Cope with horrid API which requires us to unmap more than the
size argument if it happens to be a large-page mapping. */
- if (!pfn_to_dma_pte(dmar_domain, iova >> VTD_PAGE_SHIFT, &level))
- BUG();
+ BUG_ON(!pfn_to_dma_pte(dmar_domain, iova >> VTD_PAGE_SHIFT, &level));
if (size < VTD_PAGE_SIZE << level_to_offset_bits(level))
size = VTD_PAGE_SIZE << level_to_offset_bits(level);
--
1.9.1
next prev parent reply other threads:[~2015-08-13 17:33 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-13 17:33 [PATCH 0/9] iommu: Fix some static checker warnings Joerg Roedel
[not found] ` <1439487236-14098-1-git-send-email-joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-08-13 17:33 ` [PATCH 1/9] iommu/amd: Simplify allocation in irq_remapping_alloc() Joerg Roedel
2015-08-13 17:33 ` [PATCH 2/9] iommu/amd: Make a symbol static Joerg Roedel
2015-08-13 17:33 ` [PATCH 3/9] iommu/amd: Use BUG_ON instead of if () BUG() Joerg Roedel
2015-08-13 17:33 ` [PATCH 4/9] iommu/vt-d: Return false instead of 0 in irq_remapping_cap() Joerg Roedel
2015-08-13 17:33 ` Joerg Roedel [this message]
2015-08-13 17:33 ` [PATCH 6/9] iommu/vt-d: Make two functions static Joerg Roedel
2015-08-13 17:33 ` [PATCH 7/9] iommu/vt-d: Access iomem correctly Joerg Roedel
2015-08-13 17:33 ` [PATCH 8/9] iommu/msm: Use BUG_ON instead of if () BUG() Joerg Roedel
2015-08-13 17:33 ` [PATCH 9/9] iommu/io-pgtable-arm: Move init-fn declarations to io-pgtable.h Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1439487236-14098-6-git-send-email-joro@8bytes.org \
--to=joro-zlv9swrftaidnm+yrofe0a@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=jroedel-l3A5Bk7waGM@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox