From patchwork Wed Oct 24 02:36:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Greer X-Patchwork-Id: 1635381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 46A0BDF283 for ; Wed, 24 Oct 2012 02:38:52 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TQqq6-0002kr-2K; Wed, 24 Oct 2012 02:37:02 +0000 Received: from mail20.dotsterhost.com ([66.11.232.73]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1TQqph-0002ef-GS for linux-arm-kernel@lists.infradead.org; Wed, 24 Oct 2012 02:36:39 +0000 Received: (qmail 25949 invoked from network); 24 Oct 2012 02:36:28 -0000 Received: from unknown (HELO blue.animalcreek.com) (mgreer@animalcreek.com@[68.3.93.7]) by 66.11.232.73 with SMTP; 24 Oct 2012 02:36:28 -0000 Received: from blue.animalcreek.com (localhost [127.0.0.1]) by blue.animalcreek.com (Postfix) with ESMTP id 0C5FF659B6; Tue, 23 Oct 2012 19:36:28 -0700 (MST) From: "Mark A. Greer" To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 4/7] ARM: OMAP2+: Remove unnecessary message when no SHA IP is present Date: Tue, 23 Oct 2012 19:36:04 -0700 Message-Id: <1351046167-4882-5-git-send-email-mgreer@animalcreek.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1351046167-4882-1-git-send-email-mgreer@animalcreek.com> References: <1351046167-4882-1-git-send-email-mgreer@animalcreek.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.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 [66.11.232.73 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: paul@pwsan.com, herbert@gondor.apana.org.au, khilman@deeprootsystems.com, "Mark A. Greer" , dmitry.kasatkin@intel.com, linux-crypto@vger.kernel.org, rmk+kernel@arm.linux.org.uk, davem@davemloft.net X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: "Mark A. Greer" Remove the error message that prints when there is no SHA IP present to make it consistent with all the other IPs. CC: Paul Walmsley Signed-off-by: Mark A. Greer --- arch/arm/mach-omap2/devices.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index f38ac9d..f41c793 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -456,20 +456,15 @@ static void omap_init_rng(void) static void __init omap_init_sham(void) { - if (cpu_is_omap24xx() || cpu_is_omap34xx()) { - struct omap_hwmod *oh; - struct platform_device *pdev; + struct omap_hwmod *oh; + struct platform_device *pdev; - oh = omap_hwmod_lookup("sham"); - if (!oh) - return; + oh = omap_hwmod_lookup("sham"); + if (!oh) + return; - pdev = omap_device_build("omap-sham", -1, oh, NULL, 0, NULL, - 0, 0); - WARN(IS_ERR(pdev), "Can't build omap_device for omap-sham\n"); - } else { - pr_err("%s: platform not supported\n", __func__); - } + pdev = omap_device_build("omap-sham", -1, oh, NULL, 0, NULL, 0, 0); + WARN(IS_ERR(pdev), "Can't build omap_device for omap-sham\n"); } #if defined(CONFIG_CRYPTO_DEV_OMAP_AES) || defined(CONFIG_CRYPTO_DEV_OMAP_AES_MODULE)