From patchwork Wed Jun 30 15:54:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Egger X-Patchwork-Id: 108868 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5UFtApI023890 for ; Wed, 30 Jun 2010 15:55:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754571Ab0F3Pyp (ORCPT ); Wed, 30 Jun 2010 11:54:45 -0400 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:39505 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754015Ab0F3Pyo (ORCPT ); Wed, 30 Jun 2010 11:54:44 -0400 Received: from faui49p (faui49p.informatik.uni-erlangen.de [131.188.42.67]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 8AF195F278; Wed, 30 Jun 2010 17:54:42 +0200 (MEST) Received: by faui49p (sSMTP sendmail emulation); Wed, 30 Jun 2010 17:54:42 +0200 Date: Wed, 30 Jun 2010 17:54:42 +0200 From: Christoph Egger To: Tony Lindgren , Russell King , Cory Maccarrone , "Zebediah C. McClure" , Alistair Buxton , linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: vamos@i4.informatik.uni-erlangen.de Subject: [PATCH 03/33] Removing dead OMAP_MUX_ERRORS Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Wed, 30 Jun 2010 15:55:11 +0000 (UTC) diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c index 8434137..1ddb02c 100644 --- a/arch/arm/mach-omap1/mux.c +++ b/arch/arm/mach-omap1/mux.c @@ -439,12 +439,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg) cfg->pull_name, cfg->pull_reg, pull_orig, pull); } #endif - -#ifdef CONFIG_OMAP_MUX_ERRORS - return warn ? -ETXTBSY : 0; -#else return 0; -#endif } int __init omap1_mux_init(void)