From: Anshuman Khandual <khandual@linux.vnet.ibm.com>
To: linuxppc-dev@ozlabs.org
Cc: mikey@neuling.org, mpe@ellerman.id.au
Subject: [RFC 6/8] powerpc/prom: Simplify the logic while fetching SLB size
Date: Tue, 21 Jul 2015 12:28:44 +0530 [thread overview]
Message-ID: <1437461926-8908-6-git-send-email-khandual@linux.vnet.ibm.com> (raw)
In-Reply-To: <1437461926-8908-1-git-send-email-khandual@linux.vnet.ibm.com>
From: "khandual@linux.vnet.ibm.com" <khandual@linux.vnet.ibm.com>
This patch just simplifies the existing code logic while fetching
the SLB size property from the device tree.
Signed-off-by: Anshuman Khandual <khandual@linux.vnet.ibm.com>
---
arch/powerpc/kernel/prom.c | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 8b888b1..f6168e2 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -223,14 +223,12 @@ static void __init check_cpu_slb_size(unsigned long node)
const __be32 *slb_size_ptr;
slb_size_ptr = of_get_flat_dt_prop(node, "slb-size", NULL);
- if (slb_size_ptr != NULL) {
- mmu_slb_size = be32_to_cpup(slb_size_ptr);
- return;
- }
- slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL);
- if (slb_size_ptr != NULL) {
- mmu_slb_size = be32_to_cpup(slb_size_ptr);
+ if (!slb_size_ptr) {
+ slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL);
+ if (!slb_size_ptr)
+ return;
}
+ mmu_slb_size = be32_to_cpup(slb_size_ptr);
}
#else
#define check_cpu_slb_size(node) do { } while(0)
--
2.1.0
next prev parent reply other threads:[~2015-07-21 6:59 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-21 6:58 [RFC 1/8] powerpc/slb: Remove a duplicate extern variable Anshuman Khandual
2015-07-21 6:58 ` [RFC 2/8] powerpc/slb: Rename all the 'entry' occurrences to 'slot' Anshuman Khandual
2015-07-21 9:46 ` [RFC, " Michael Ellerman
2015-07-21 11:23 ` [RFC,2/8] " Anshuman Khandual
2015-07-21 6:58 ` [RFC 3/8] powerpc/slb: Define macros for the bolted slots Anshuman Khandual
2015-07-22 9:32 ` Michael Ellerman
2015-07-21 6:58 ` [RFC 4/8] powerpc/slb: Add some helper functions to improve modularization Anshuman Khandual
2015-07-22 9:19 ` Michael Ellerman
2015-07-21 6:58 ` [RFC 5/8] powerpc/slb: Add documentation to runtime patching of SLB encoding Anshuman Khandual
2015-07-22 5:51 ` Michael Ellerman
2015-07-22 5:57 ` Gabriel Paubert
2015-07-22 9:01 ` Michael Ellerman
2015-07-22 12:17 ` Segher Boessenkool
2015-07-21 6:58 ` Anshuman Khandual [this message]
2015-07-21 10:21 ` [RFC, 6/8] powerpc/prom: Simplify the logic while fetching SLB size Michael Ellerman
2015-07-21 11:24 ` Anshuman Khandual
2015-07-21 6:58 ` [RFC 7/8] powerpc/xmon: Drop 'valid' from the condition inside 'dump_segments' Anshuman Khandual
2015-07-21 10:00 ` [RFC, " Michael Ellerman
2015-07-21 11:45 ` Anshuman Khandual
2015-07-22 4:52 ` Michael Ellerman
2015-07-21 6:58 ` [RFC 8/8] powerpc/xmon: Add some more elements to the existing PACA dump list Anshuman Khandual
2015-07-21 10:08 ` [RFC, " Michael Ellerman
2015-07-21 11:48 ` Anshuman Khandual
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=1437461926-8908-6-git-send-email-khandual@linux.vnet.ibm.com \
--to=khandual@linux.vnet.ibm.com \
--cc=linuxppc-dev@ozlabs.org \
--cc=mikey@neuling.org \
--cc=mpe@ellerman.id.au \
/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;
as well as URLs for NNTP newsgroup(s).