From: Joerg Roedel <joro@8bytes.org>
To: iommu@lists.linux-foundation.org
Cc: linux-kernel@vger.kernel.org, Joerg Roedel <jroedel@suse.de>
Subject: [PATCH 3/9] iommu/amd: Use BUG_ON instead of if () BUG()
Date: Thu, 13 Aug 2015 19:33:50 +0200 [thread overview]
Message-ID: <1439487236-14098-4-git-send-email-joro@8bytes.org> (raw)
In-Reply-To: <1439487236-14098-1-git-send-email-joro@8bytes.org>
From: Joerg Roedel <jroedel@suse.de>
Found by a coccicheck script.
Signed-off-by: Joerg Roedel <jroedel@suse.de>
---
drivers/iommu/amd_iommu.c | 4 ++--
drivers/iommu/amd_iommu_v2.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
index a158579..f82060e7 100644
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1835,8 +1835,8 @@ static void free_gcr3_table(struct protection_domain *domain)
free_gcr3_tbl_level2(domain->gcr3_tbl);
else if (domain->glx == 1)
free_gcr3_tbl_level1(domain->gcr3_tbl);
- else if (domain->glx != 0)
- BUG();
+ else
+ BUG_ON(domain->glx != 0);
free_page((unsigned long)domain->gcr3_tbl);
}
diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c
index f7b875b..1131664 100644
--- a/drivers/iommu/amd_iommu_v2.c
+++ b/drivers/iommu/amd_iommu_v2.c
@@ -356,8 +356,8 @@ static void free_pasid_states(struct device_state *dev_state)
free_pasid_states_level2(dev_state->states);
else if (dev_state->pasid_levels == 1)
free_pasid_states_level1(dev_state->states);
- else if (dev_state->pasid_levels != 0)
- BUG();
+ else
+ BUG_ON(dev_state->pasid_levels != 0);
free_page((unsigned long)dev_state->states);
}
--
1.9.1
next prev parent reply other threads:[~2015-08-13 17:34 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
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 ` Joerg Roedel [this message]
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 ` [PATCH 5/9] iommu/vt-d: Use BUG_ON instead of if () BUG() Joerg Roedel
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-4-git-send-email-joro@8bytes.org \
--to=joro@8bytes.org \
--cc=iommu@lists.linux-foundation.org \
--cc=jroedel@suse.de \
--cc=linux-kernel@vger.kernel.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
all inboxes | Powered by JetHome®