From d793bc28d850e0a8760182c777b8e8ac1b419d7e Mon Sep 17 00:00:00 2001 From: Lee Leahy Date: Thu, 9 Mar 2017 10:00:30 -0800 Subject: [PATCH] UPSTREAM: soc/intel/apollolake: Remove unnecessary braces Fix the following warnings detected by checkpatch.pl: WARNING: braces {} are not necessary for any arm of this statement WARNING: braces {} are not necessary for single statement blocks TEST=Build for reef Change-Id: If5e634a92e3f2f1a2a9a609898eedf95de6f878b Signed-off-by: Patrick Georgi Original-Commit-Id: 4430f9f75d81007f8748327526522c8c774d10b3 Original-Change-Id: Ifab09c023faa7da215945f1aedd391f4b2a1a04c Original-Signed-off-by: Lee Leahy Original-Reviewed-on: https://review.coreboot.org/18723 Original-Tested-by: build bot (Jenkins) Original-Reviewed-by: Philippe Mathieu-Daud Original-Reviewed-by: Martin Roth Reviewed-on: https://chromium-review.googlesource.com/454564 --- src/soc/intel/apollolake/chip.c | 5 ++--- src/soc/intel/apollolake/lpc.c | 6 ++---- src/soc/intel/apollolake/northbridge.c | 3 +-- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/soc/intel/apollolake/chip.c b/src/soc/intel/apollolake/chip.c index 9ac047e142..eacf554105 100644 --- a/src/soc/intel/apollolake/chip.c +++ b/src/soc/intel/apollolake/chip.c @@ -154,11 +154,10 @@ static struct device_operations cpu_bus_ops = { static void enable_dev(device_t dev) { /* Set the operations if it is a special bus type */ - if (dev->path.type == DEVICE_PATH_DOMAIN) { + if (dev->path.type == DEVICE_PATH_DOMAIN) dev->ops = &pci_domain_ops; - } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { + else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) dev->ops = &cpu_bus_ops; - } } /* diff --git a/src/soc/intel/apollolake/lpc.c b/src/soc/intel/apollolake/lpc.c index 5455dedf1d..810c4c9af3 100644 --- a/src/soc/intel/apollolake/lpc.c +++ b/src/soc/intel/apollolake/lpc.c @@ -117,9 +117,8 @@ static void loop_resources(struct device *dev) for (res = dev->resource_list; res; res = res->next) { - if (res->flags & IORESOURCE_IO) { + if (res->flags & IORESOURCE_IO) lpc_open_pmio_window(res->base, res->size); - } if (res->flags & IORESOURCE_MEM) { /* Check if this is already decoded. */ @@ -143,9 +142,8 @@ static void set_child_resources(struct device *dev) struct device *child; for (link = dev->link_list; link; link = link->next) { - for (child = link->children; child; child = child->sibling) { + for (child = link->children; child; child = child->sibling) loop_resources(child); - } } } diff --git a/src/soc/intel/apollolake/northbridge.c b/src/soc/intel/apollolake/northbridge.c index db595f5614..e1b54ec393 100644 --- a/src/soc/intel/apollolake/northbridge.c +++ b/src/soc/intel/apollolake/northbridge.c @@ -81,9 +81,8 @@ static int mc_add_imr_resources(device_t dev, int index) base = read32(mchbar + imr_offset + MCHBAR_IMR0BASE); mask = read32(mchbar + imr_offset + MCHBAR_IMR0MASK); - if (is_imr_enabled(base)) { + if (is_imr_enabled(base)) imr_resource(dev, index++, base, mask); - } } return index;