From: Joerg Roedel <joerg.roedel@amd.com>
To: mingo@redhat.com, tglx@linutronix.de
Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org,
bhavna.sarathy@amd.com, robert.richter@amd.com,
Joerg Roedel <joerg.roedel@amd.com>
Subject: [PATCH 07/16] AMD IOMMU: remove unnecessary free checks from init code
Date: Fri, 11 Jul 2008 17:14:26 +0200 [thread overview]
Message-ID: <1215789275-20975-8-git-send-email-joerg.roedel@amd.com> (raw)
In-Reply-To: <1215789275-20975-1-git-send-email-joerg.roedel@amd.com>
This patch removes unnecessary checks before memory is released.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
arch/x86/kernel/amd_iommu_init.c | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
index 1f14839..0f5a911 100644
--- a/arch/x86/kernel/amd_iommu_init.c
+++ b/arch/x86/kernel/amd_iommu_init.c
@@ -417,9 +417,7 @@ static u8 * __init alloc_command_buffer(struct amd_iommu *iommu)
static void __init free_command_buffer(struct amd_iommu *iommu)
{
- if (iommu->cmd_buf)
- free_pages((unsigned long)iommu->cmd_buf,
- get_order(CMD_BUFFER_SIZE));
+ free_pages((unsigned long)iommu->cmd_buf, get_order(CMD_BUFFER_SIZE));
}
/* sets a specific bit in the device table entry. */
@@ -987,24 +985,19 @@ out:
return ret;
free:
- if (amd_iommu_pd_alloc_bitmap)
- free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, 1);
+ free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, 1);
- if (amd_iommu_pd_table)
- free_pages((unsigned long)amd_iommu_pd_table,
- get_order(rlookup_table_size));
+ free_pages((unsigned long)amd_iommu_pd_table,
+ get_order(rlookup_table_size));
- if (amd_iommu_rlookup_table)
- free_pages((unsigned long)amd_iommu_rlookup_table,
- get_order(rlookup_table_size));
+ free_pages((unsigned long)amd_iommu_rlookup_table,
+ get_order(rlookup_table_size));
- if (amd_iommu_alias_table)
- free_pages((unsigned long)amd_iommu_alias_table,
- get_order(alias_table_size));
+ free_pages((unsigned long)amd_iommu_alias_table,
+ get_order(alias_table_size));
- if (amd_iommu_dev_table)
- free_pages((unsigned long)amd_iommu_dev_table,
- get_order(dev_table_size));
+ free_pages((unsigned long)amd_iommu_dev_table,
+ get_order(dev_table_size));
free_iommu_all();
--
1.5.3.7
next prev parent reply other threads:[~2008-07-11 15:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-11 15:14 [PATCH 0/16] AMD IOMMU updates Joerg Roedel
2008-07-11 15:14 ` [PATCH 01/16] AMD IOMMU: add comments to amd_iommu_types.h Joerg Roedel
2008-07-11 15:14 ` [PATCH 02/16] AMD IOMMU: add comments to the initialization code Joerg Roedel
2008-07-11 15:14 ` [PATCH 03/16] AMD IOMMU: add comments to core code Joerg Roedel
2008-07-11 15:14 ` [PATCH 04/16] AMD IOMMU: replace HIGH_U32 macro with upper_32_bits function Joerg Roedel
2008-07-11 15:14 ` [PATCH 05/16] AMD IOMMU: replace UPDATE_LAST_BDF macro with a function Joerg Roedel
2008-07-11 15:14 ` [PATCH 06/16] AMD IOMMU: replace TBL_SIZE " Joerg Roedel
2008-07-11 15:14 ` Joerg Roedel [this message]
2008-07-11 15:14 ` [PATCH 08/16] AMD IOMMU: add an emergency exit to the completion wait loop Joerg Roedel
2008-07-11 15:14 ` [PATCH 09/16] AMD IOMMU: rename struct command to iommu_cmd Joerg Roedel
2008-07-11 15:14 ` [PATCH 10/16] AMD IOMMU: remove unneeded initializations from command buffer allocation Joerg Roedel
2008-07-11 15:14 ` [PATCH 11/16] AMD IOMMU: use true/false instead of 0/1 for bool value Joerg Roedel
2008-07-11 15:14 ` [PATCH 12/16] AMD IOMMU: do runtime list initialization at compile time Joerg Roedel
2008-07-11 15:14 ` [PATCH 13/16] AMD IOMMU: replace memset with __GFP_ZERO for table allocation Joerg Roedel
2008-07-11 15:14 ` [PATCH 14/16] AMD IOMMU: replace self made size parsing with memparse call Joerg Roedel
2008-07-11 15:14 ` [PATCH 15/16] AMD IOMMU: fix device table entry size Joerg Roedel
2008-07-11 15:14 ` [PATCH 16/16] AMD IOMMU: replace DEVID macro with a function Joerg Roedel
2008-07-11 16:01 ` [PATCH 0/16] AMD IOMMU updates Ingo Molnar
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=1215789275-20975-8-git-send-email-joerg.roedel@amd.com \
--to=joerg.roedel@amd.com \
--cc=bhavna.sarathy@amd.com \
--cc=iommu@lists.linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=robert.richter@amd.com \
--cc=tglx@linutronix.de \
/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®