From: Emil Medve <Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
To: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org,
jroedel-l3A5Bk7waGM@public.gmane.org,
Varun.Sethi-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org
Cc: Emil Medve <Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
Subject: [PATCH 07/26] iommu/fsl: Fix checkpath type BRACES
Date: Wed, 28 Jan 2015 08:34:39 -0600 [thread overview]
Message-ID: <1422455698-3074-8-git-send-email-Emilian.Medve@Freescale.com> (raw)
In-Reply-To: <1422455698-3074-1-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
WARNING:BRACES: braces {} are not necessary for single statement blocks
+ if (!paace) {
+ return -ENOENT;
+ }
WARNING:BRACES: braces {} are not necessary for single statement blocks
+ if (!paace) {
+ return -ENOENT;
+ }
WARNING:BRACES: braces {} are not necessary for single statement blocks
+ if (!ppaace) {
+ return -ENOENT;
+ }
CHECK:BRACES: Blank lines aren't necessary after an open brace '{'
+{
+
CHECK:BRACES: Blank lines aren't necessary before a close brace '}'
+
+}
CHECK:BRACES: Blank lines aren't necessary before a close brace '}'
+
+}
CHECK:BRACES: Blank lines aren't necessary before a close brace '}'
+
+}
CHECK:BRACES: Blank lines aren't necessary after an open brace '{'
+ for (i = 0; i < num; i++) {
+
CHECK:BRACES: braces {} should be used on all arms of this statement
+ if (pci_ctl->parent->iommu_group) {
[...]
+ } else
[...]
Signed-off-by: Emil Medve <Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
---
drivers/iommu/fsl_pamu.c | 9 +++------
drivers/iommu/fsl_pamu_domain.c | 8 ++------
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c
index ccdc5e5..6b28dd8 100644
--- a/drivers/iommu/fsl_pamu.c
+++ b/drivers/iommu/fsl_pamu.c
@@ -278,9 +278,8 @@ int pamu_update_paace_stash(int liodn, u32 subwin, u32 value)
}
if (subwin) {
paace = pamu_get_spaace(paace, subwin - 1);
- if (!paace) {
+ if (!paace)
return -ENOENT;
- }
}
set_bf(paace->impl_attr, PAACE_IA_CID, value);
@@ -301,9 +300,8 @@ int pamu_disable_spaace(int liodn, u32 subwin)
}
if (subwin) {
paace = pamu_get_spaace(paace, subwin - 1);
- if (!paace) {
+ if (!paace)
return -ENOENT;
- }
set_bf(paace->addr_bitfields, PAACE_AF_V,
PAACE_V_INVALID);
} else {
@@ -351,9 +349,8 @@ int pamu_config_ppaace(int liodn, phys_addr_t win_addr, phys_addr_t win_size,
}
ppaace = pamu_get_ppaace(liodn);
- if (!ppaace) {
+ if (!ppaace)
return -ENOENT;
- }
/* window size is 2^(WSE+1) bytes */
set_bf(ppaace->addr_bitfields, PPAACE_AF_WSE,
diff --git a/drivers/iommu/fsl_pamu_domain.c b/drivers/iommu/fsl_pamu_domain.c
index dc38db5..080ffa4 100644
--- a/drivers/iommu/fsl_pamu_domain.c
+++ b/drivers/iommu/fsl_pamu_domain.c
@@ -35,7 +35,6 @@ static DEFINE_SPINLOCK(device_domain_lock);
static int __init iommu_init_mempool(void)
{
-
fsl_pamu_domain_cache = kmem_cache_create("fsl_pamu_domain",
sizeof(struct fsl_dma_domain),
0,
@@ -153,7 +152,6 @@ static int map_liodn(int liodn, struct fsl_dma_domain *dma_domain)
return map_subwins(liodn, dma_domain);
else
return map_win(liodn, dma_domain);
-
}
/* Update window/subwindow mapping for the LIODN */
@@ -380,7 +378,6 @@ static void attach_device(struct fsl_dma_domain *dma_domain, int liodn, struct d
if (!dev->archdata.iommu_domain)
dev->archdata.iommu_domain = info;
spin_unlock_irqrestore(&device_domain_lock, flags);
-
}
static phys_addr_t fsl_pamu_iova_to_phys(struct iommu_domain *domain,
@@ -527,7 +524,6 @@ static void fsl_pamu_window_disable(struct iommu_domain *domain, u32 wnd_nr)
}
spin_unlock_irqrestore(&dma_domain->domain_lock, flags);
-
}
static int fsl_pamu_window_enable(struct iommu_domain *domain, u32 wnd_nr,
@@ -616,7 +612,6 @@ static int handle_attach_device(struct fsl_dma_domain *dma_domain,
spin_lock_irqsave(&dma_domain->domain_lock, flags);
for (i = 0; i < num; i++) {
-
/* Ensure that LIODN value is valid */
if (liodn[i] >= PAACE_NUMBER_ENTRIES) {
pr_debug("Invalid liodn %d, attach device failed for %s\n",
@@ -951,8 +946,9 @@ static struct iommu_group *get_pci_device_group(struct pci_dev *pdev)
if (pci_ctl->parent->iommu_group) {
group = get_device_iommu_group(pci_ctl->parent);
iommu_group_remove_device(pci_ctl->parent);
- } else
+ } else {
group = get_shared_pci_device_group(pdev);
+ }
}
if (!group)
--
2.2.2
next prev parent reply other threads:[~2015-01-28 14:34 UTC|newest]
Thread overview: 73+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 14:34 [PATCH 00/26] iommu/fsl: Various cleanup Emil Medve
[not found] ` <1422455698-3074-1-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-28 14:34 ` [PATCH v2 01/26] iommu/fsl: Sprinkle some __init* annotations Emil Medve
[not found] ` <1422455698-3074-2-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 6:46 ` Varun Sethi
[not found] ` <BN3PR0301MB121998FEF4EE5C92DEEF7D61EA310-CEkquS/Gb81uuip9JPHoc5wN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2015-01-30 6:55 ` Emil Medve
[not found] ` <54CB2AEC.9000800-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:20 ` Varun Sethi
[not found] ` <BN3PR0301MB1219965593D06F96A8A1ADB8EA310-CEkquS/Gb81uuip9JPHoc5wN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2015-01-30 14:23 ` Emil Medve
[not found] ` <54CB93ED.80109-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 14:44 ` Varun Sethi
2015-02-09 21:46 ` Emil Medve
[not found] ` <54D92ABC.3030802-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-02-10 2:26 ` Varun Sethi
[not found] ` <BY1PR0301MB122186F802612D1B8048722AEA240-M1kb196zaoruTkAIFHd/+ZwN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2015-02-11 11:07 ` Emil Medve
[not found] ` <54DB37DA.2040500-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-02-11 11:30 ` Varun Sethi
2015-02-11 13:47 ` Varun Sethi
2015-02-11 11:35 ` Joerg Roedel
2015-01-28 14:34 ` [PATCH 02/26] iommu/fsl: Use SVR_* instead of magic numbers Emil Medve
[not found] ` <1422455698-3074-3-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 6:57 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 03/26] iommu/fsl: Remove unused/extra includes Emil Medve
[not found] ` <1422455698-3074-4-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:10 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 04/26] iommu/fsl: Fix checkpatch type SPACE_BEFORE_TAB Emil Medve
[not found] ` <1422455698-3074-5-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:12 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 05/26] iommu/fsl: Fix checkpatch type LINE_SPACING Emil Medve
[not found] ` <1422455698-3074-6-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:13 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 06/26] iommu/fsl: Fix checkpatch type LEADING_SPACE Emil Medve
[not found] ` <1422455698-3074-7-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:15 ` Varun Sethi
2015-01-28 14:34 ` Emil Medve [this message]
[not found] ` <1422455698-3074-8-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:17 ` [PATCH 07/26] iommu/fsl: Fix checkpath type BRACES Varun Sethi
2015-01-28 14:34 ` [PATCH 08/26] iommu/fsl: Fix checkpatch type CODE_INDENT Emil Medve
[not found] ` <1422455698-3074-9-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:19 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 09/26] iommu/fsl: Fix checkpatch type ALLOC_SIZEOF_STRUCT Emil Medve
[not found] ` <1422455698-3074-10-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:30 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 10/26] iommu/fsl: Fix checkpatch type ALLOC_WITH_MULTIPLY Emil Medve
[not found] ` <1422455698-3074-11-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:33 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 11/26] iommu/fsl: Fix checkpatch type OOM_MESSAGE Emil Medve
[not found] ` <1422455698-3074-12-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:43 ` Varun Sethi
[not found] ` <BN3PR0301MB1219BCCB01E99D150D0753F6EA310-CEkquS/Gb81uuip9JPHoc5wN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2015-01-30 14:18 ` Emil Medve
[not found] ` <54CB92C0.5000304-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 14:47 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 12/26] iommu/fsl: Fix checkpatch type TYPO_SPELLING Emil Medve
[not found] ` <1422455698-3074-13-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:40 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 13/26] iommu/fsl: Fix checkpatch type PREFER_PACKED Emil Medve
[not found] ` <1422455698-3074-14-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:40 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 14/26] iommu/fsl: Fix checkpatch type QUOTED_WHITESPACE_BEFORE_NEWLINE Emil Medve
[not found] ` <1422455698-3074-15-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:42 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 15/26] iommu/fsl: Fix checkpatch type SPACING Emil Medve
[not found] ` <1422455698-3074-16-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:44 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 16/26] iommu/fsl: Use a device pointer to make lines shorter Emil Medve
[not found] ` <1422455698-3074-17-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:46 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 17/26] iommu/fsl: Remove pr/dev_*() prefixes Emil Medve
[not found] ` <1422455698-3074-18-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 7:47 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 18/26] iommu/fsl: Fix checkpatch type PARENTHESIS_ALIGNMENT Emil Medve
[not found] ` <1422455698-3074-19-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:29 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 19/26] iommu/fsl: Fix some comments alignment Emil Medve
[not found] ` <1422455698-3074-20-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:30 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 20/26] iommu/fsl: Fix alignment of some stray lines Emil Medve
[not found] ` <1422455698-3074-21-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:31 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 21/26] iommu/fsl: Fix checkpatch type LONG_LINE Emil Medve
[not found] ` <1422455698-3074-22-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:32 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 22/26] iommu/fsl: Make local symbols static Emil Medve
[not found] ` <1422455698-3074-23-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:33 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 23/26] iommu/fsl: Use NULL instead of zero Emil Medve
[not found] ` <1422455698-3074-24-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:33 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 24/26] iommu/fsl: Remove unneeded semicolon Emil Medve
[not found] ` <1422455698-3074-25-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:34 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 25/26] iommu/fsl: Don't use integers values with bool type Emil Medve
[not found] ` <1422455698-3074-26-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:35 ` Varun Sethi
2015-01-28 14:34 ` [PATCH 26/26] iommu/fsl: Remove extra paranthesis Emil Medve
[not found] ` <1422455698-3074-27-git-send-email-Emilian.Medve-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-01-30 9:40 ` Varun Sethi
2015-01-30 12:30 ` [PATCH 00/26] iommu/fsl: Various cleanup Joerg Roedel
[not found] ` <20150130123040.GE3702-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-01-30 14:50 ` Varun Sethi
[not found] ` <BN3PR0301MB12194ECBA7501AFE17F34F69EA310-CEkquS/Gb81uuip9JPHoc5wN6zqB+hSMnBOFsp37pqbUKgpGm//BTAC/G2K4zDHf@public.gmane.org>
2015-01-30 15:36 ` Joerg Roedel
[not found] ` <20150130153626.GH3702-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-01-31 17:37 ` Varun Sethi
2015-01-31 17:58 ` Timur Tabi
[not found] ` <CAOZdJXXk5L7AFwryKXiTemw=jw+VXXXBZXdapzgzs4APC0PLtQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-02-01 6:05 ` Emil Medve
[not found] ` <54CDC236.70004-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org>
2015-02-01 17:07 ` Timur Tabi
2015-02-03 17:51 ` 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=1422455698-3074-8-git-send-email-Emilian.Medve@Freescale.com \
--to=emilian.medve-edlz3wwmn0ll57midrcfdg@public.gmane.org \
--cc=Varun.Sethi-eDlz3WWmN0ll57MIdRCFDg@public.gmane.org \
--cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
--cc=joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org \
--cc=jroedel-l3A5Bk7waGM@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