From patchwork Fri Jun 24 10:50:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 640147 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rbZr25TSgz9t1C for ; Fri, 24 Jun 2016 20:50:58 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bGOfw-000577-Mh; Fri, 24 Jun 2016 10:49:28 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bGOfF-0004dK-9v for linux-arm-kernel@lists.infradead.org; Fri, 24 Jun 2016 10:48:46 +0000 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0Lecww-1bicOQ2Am6-00qRGC; Fri, 24 Jun 2016 12:48:12 +0200 From: Arnd Bergmann To: Shawn Guo Subject: [PATCH 5/6] ARM: imx: remove last call to cpu_is_mx5* Date: Fri, 24 Jun 2016 12:50:00 +0200 Message-Id: <20160624105001.3166287-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160624105001.3166287-1-arnd@arndb.de> References: <20160624105001.3166287-1-arnd@arndb.de> X-Provags-ID: V03:K0:E39brtvrp/kEcJ5JxcKmvKxkXS6e9DlWoBNtVTYJOdDpX6sB8rS Ak+TlAbZPDS5KxfhacG8lScBIL5xw7CTUsBa7RiGq/enX7BTbacLNkI7De8IIw/tSWeaoOV WhfQaHUz71SULej+Gm0EpBoBLaoQBHaqGwqCuJUN9xtiE+DHhEHN2EcV9HLr5ymZ8p9BxAQ W4ax4F5vbjKhqtyAy2Fyw== X-UI-Out-Filterresults: notjunk:1; V01:K0:8cLHWv9G2v8=:HseDjSQzmODtjip/1Us3y2 umA2KJWUHLqWcWIZGqymlhpMXxdP2tutOi5fXMPlMGSB5sMkEGKXrvBJsygEZXggTNjIY7APg DDKEF4W2yl2/Jz8Adake4n4xVL6MBVL/20Z4Bdf09T8p7gA2hI+0K55Sb2F7Cht4dk/bMBjv4 QY9rZKrImDXjsIbW4XeMlLWFVQFi71o0wMbb/aui+ng9FmqIemT9LRWVUzBg0y/kZNVF3FioB +sr590o8vwiHg20BHzJCjUUAjVhHGIG9DlB3e3sq6pBsstCFf6AaIvysKIrhs36em2dgJ6Uz8 YSqEkxe5I4xtUKCcCFGSsjwW50bLTKxXBWb0zd8lRPUiO4aRi8/tJYzoIYwUbn2VF52e50Ub8 jK1dFdd/Ohm9pctwt6nyniy6OivHcN8AXgAYKvh9pAhM0qJYdM8qC+FRIrQeiL0hfSsBrB2MF hloMumR87BsJ1c3XA+MchoWnSU6w1UJE3OuaVNpGYCBorvK6bg9ixX3X5ISkVIPAVZZkIbD+Y NZ8lyf2ue87oYSPiIJFryIm/10pN0LVDwivxkj1mmCFhO0jYVNSr8Z9XbaA4tpRAsnIgev8Hb cpE2OQ42fmtawqEb0hHY3lMqV3ZKxZMgR3GgFrakM0PYiZTR/O6XWVKowcr99ar3LR0Raa0S2 poITUa3kLiZ2WYodsOUeO0LDBwOGZULA9V/PiB20upVgKlo3paw0UKFhllUzJOtI2xm0= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160624_034845_826880_664DEF0F X-CRM114-Status: GOOD ( 11.36 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.10 listed in wl.mailspike.net] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabio Estevam , Arnd Bergmann , Sascha Hauer , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org The check for cpu_is_mx51/cpu_is_mx53() in mx51_revision()/mx53_revision() is just a safety precaution, but there are only two callers of this are using it only on the correct CPUs, and none of the other respective functions have this extra check. Removing these lets us kill off the cpu_is_* functions. Signed-off-by: Arnd Bergmann --- arch/arm/mach-imx/cpu-imx5.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c index 3403bac94a31..4f2d1c772f85 100644 --- a/arch/arm/mach-imx/cpu-imx5.c +++ b/arch/arm/mach-imx/cpu-imx5.c @@ -60,13 +60,9 @@ static int get_mx51_srev(void) /* * Returns: * the silicon revision of the cpu - * -EINVAL - not a mx51 */ int mx51_revision(void) { - if (!cpu_is_mx51()) - return -EINVAL; - if (mx5_cpu_rev == -1) mx5_cpu_rev = get_mx51_srev(); @@ -112,13 +108,9 @@ static int get_mx53_srev(void) /* * Returns: * the silicon revision of the cpu - * -EINVAL - not a mx53 */ int mx53_revision(void) { - if (!cpu_is_mx53()) - return -EINVAL; - if (mx5_cpu_rev == -1) mx5_cpu_rev = get_mx53_srev();