From patchwork Sat Oct 29 14:28:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heiner Kallweit X-Patchwork-Id: 688792 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t5jkk69R1z9t0q for ; Sun, 30 Oct 2016 01:32:14 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=K2RHxDUM; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3t5jkk53FNzDvVv for ; Sun, 30 Oct 2016 01:32:14 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=K2RHxDUM; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3t5jgP55JkzDvT1 for ; Sun, 30 Oct 2016 01:29:21 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=K2RHxDUM; dkim-atps=neutral Received: by mail-wm0-x242.google.com with SMTP id 68so4715411wmz.2 for ; Sat, 29 Oct 2016 07:29:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:subject:to:cc:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=ORKNG4aBmqRDajFwwCkkH8WgQslW/p2PP68QBSUhYCU=; b=K2RHxDUMrWrV1fcUlHegTfoSdK6wZKPupEZxrzSCFB8TmLBZjr/mFaA381spohFddJ DiaYDAOqKjRaj1vU86NzSxdXmLxsj+euRI3Z4tLJsU2EzjrNd+5W2PZQ21SqbBqjoSXD Bhfu2bWA6rE/3cJe61q+xDWy2rpZKXvfywRUwWRaV4lRSDViNDLZlwByiSZHL5YpCZOA S9O/thnHlYMa/uXfiYKDCSL4kVUYud15QdYfUqqTGksXydGWYv0Ud+S8hbsUWCXais0A fSsg+i/r5DJmAtoELRzRGkNj450QQTzvcDa3ClvIqtNnZu4iUjmQrtRJdjJURI7xxMbG LZ5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:subject:to:cc:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=ORKNG4aBmqRDajFwwCkkH8WgQslW/p2PP68QBSUhYCU=; b=jzDTP7TfPpL6d294hvxkl05upu1t6s+6WflnEE4dSdprRIX4/BeyjScE3dPO3SoAmb 7M6TzLTae8PqJMneSHylH3VITM3osFR27VkbGdizJquutmaDRjpxOKlI0rPlguEzhiWN Vr8NWjNilwwLldEBWiS0kQ177+cZ+6c+mnXtrZUJE5IgTUoTNJu072g80/UMvDFmrmvI WlT+MGNakmc8JQk1NleDPAYY2/1KZTnRCkQby+gToeNtIEqgJijdl9r9YHKfsnQfgfpb vCRXDRxzjFQBZnMNTvsEs/m4tmknoy4YRwOOQj5Su6HOPtIkv6DajJPpo77JjzRBL4xO HgLw== X-Gm-Message-State: ABUngvfo4e4q1q39BGgFxm8/FbFXHk4dEFqd7AnD3dSdc93whLC98CiLmRaoWUMal+IcWg== X-Received: by 10.194.250.1 with SMTP id yy1mr15217458wjc.219.1477751358064; Sat, 29 Oct 2016 07:29:18 -0700 (PDT) Received: from ?IPv6:2003:62:5f43:4700:f53f:2b80:9e4e:1ff0? (p200300625F434700F53F2B809E4E1FF0.dip0.t-ipconnect.de. [2003:62:5f43:4700:f53f:2b80:9e4e:1ff0]) by smtp.googlemail.com with ESMTPSA id jq10sm19676173wjb.46.2016.10.29.07.29.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 29 Oct 2016 07:29:17 -0700 (PDT) From: Heiner Kallweit Subject: [PATCH 2/3] powerpc/fsl_soc: improve and simplify get_brgfreq To: Michael Ellerman Message-ID: Date: Sat, 29 Oct 2016 16:28:25 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 MIME-Version: 1.0 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Use of_property_read_u32 instead of the generic of_get_property to simplify the code. In addition move the declaration of brgfreq into get_brgfreq because it's private to this function. Signed-off-by: Heiner Kallweit --- arch/powerpc/sysdev/fsl_soc.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c index 48fc36b..d418424 100644 --- a/arch/powerpc/sysdev/fsl_soc.c +++ b/arch/powerpc/sysdev/fsl_soc.c @@ -100,23 +100,17 @@ EXPORT_SYMBOL(fsl_get_sys_freq); #if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx) -static u32 brgfreq = -1; - u32 get_brgfreq(void) { + static u32 brgfreq = -1; struct device_node *node; - const unsigned int *prop; - int size; if (brgfreq != -1) return brgfreq; node = of_find_compatible_node(NULL, NULL, "fsl,cpm-brg"); if (node) { - prop = of_get_property(node, "clock-frequency", &size); - if (prop && size == 4) - brgfreq = *prop; - + of_property_read_u32(node, "clock-frequency", &brgfreq); of_node_put(node); return brgfreq; } @@ -129,15 +123,11 @@ u32 get_brgfreq(void) node = of_find_node_by_type(NULL, "qe"); if (node) { - prop = of_get_property(node, "brg-frequency", &size); - if (prop && size == 4) - brgfreq = *prop; - - if (brgfreq == -1 || brgfreq == 0) { - prop = of_get_property(node, "bus-frequency", &size); - if (prop && size == 4) - brgfreq = *prop / 2; - } + of_property_read_u32(node, "brg-frequency", &brgfreq); + if (brgfreq == -1 || !brgfreq) + if(!of_property_read_u32(node, "bus-frequency", + &brgfreq)) + brgfreq /= 2; of_node_put(node); }