From patchwork Mon Nov 19 18:54:57 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Greer X-Patchwork-Id: 1767891 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 652C3DF264 for ; Mon, 19 Nov 2012 18:56:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754062Ab2KSS4A (ORCPT ); Mon, 19 Nov 2012 13:56:00 -0500 Received: from mail20.dotsterhost.com ([66.11.232.73]:47533 "EHLO mail20.dotsterhost.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754088Ab2KSSz6 (ORCPT ); Mon, 19 Nov 2012 13:55:58 -0500 Received: (qmail 30333 invoked from network); 19 Nov 2012 18:55:56 -0000 Received: from unknown (HELO blue.animalcreek.com) (mgreer@animalcreek.com@[68.3.93.7]) by 66.11.232.73 with SMTP; 19 Nov 2012 18:55:56 -0000 Received: from blue.animalcreek.com (localhost [127.0.0.1]) by blue.animalcreek.com (Postfix) with ESMTP id 9E1C765A71; Mon, 19 Nov 2012 11:55:55 -0700 (MST) From: "Mark A. Greer" To: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au, davem@davemloft.net, dmitry.kasatkin@intel.com, rmk+kernel@arm.linux.org.uk, paul@pwsan.com, khilman@deeprootsystems.com, "Mark A. Greer" Subject: [PATCH v4 4/8] ARM: OMAP2+: Remove unnecessary message when no SHA IP is present Date: Mon, 19 Nov 2012 11:54:57 -0700 Message-Id: <1353351301-6453-5-git-send-email-mgreer@animalcreek.com> X-Mailer: git-send-email 1.7.12 In-Reply-To: <1353351301-6453-1-git-send-email-mgreer@animalcreek.com> References: <1353351301-6453-1-git-send-email-mgreer@animalcreek.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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 015c259..7ecce5e 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -457,20 +457,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)