From patchwork Wed Feb 17 10:16:14 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanjeev Premi X-Patchwork-Id: 79854 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1HAGU4U029597 for ; Wed, 17 Feb 2010 10:16:32 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753682Ab0BQKQW (ORCPT ); Wed, 17 Feb 2010 05:16:22 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:46787 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753260Ab0BQKQW convert rfc822-to-8bit (ORCPT ); Wed, 17 Feb 2010 05:16:22 -0500 Received: from dbdp20.itg.ti.com ([172.24.170.38]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o1HAGHtH008264 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 17 Feb 2010 04:16:19 -0600 Received: from dbde70.ent.ti.com (localhost [127.0.0.1]) by dbdp20.itg.ti.com (8.13.8/8.13.8) with ESMTP id o1HAGFlU023625; Wed, 17 Feb 2010 15:46:15 +0530 (IST) Received: from dbde02.ent.ti.com ([172.24.170.145]) by dbde70.ent.ti.com ([172.24.170.148]) with mapi; Wed, 17 Feb 2010 15:46:15 +0530 From: "Premi, Sanjeev" To: "Lohithakshan, Ranjith" , "linux-omap@vger.kernel.org" CC: "tony@atomide.com" Date: Wed, 17 Feb 2010 15:46:14 +0530 Subject: RE: [PATCH] omap: Remove DEBUGFS dependency for mux name checking Thread-Topic: [PATCH] omap: Remove DEBUGFS dependency for mux name checking Thread-Index: AcqvmQeDpzir+e8/QiWNw5YHsC+OnAAIMywA Message-ID: In-Reply-To: <1266387487-27588-1-git-send-email-ranjithl@ti.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: acceptlanguage: en-US MIME-Version: 1.0 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, 17 Feb 2010 10:16:32 +0000 (UTC) diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 19001dd..7c0c4ad 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -960,16 +960,14 @@ static void __init omap_mux_init_list(struct omap_mux *sup while (superset->reg_offset != OMAP_MUX_TERMINATOR) { struct omap_mux *entry; -#ifndef CONFIG_OMAP_MUX - /* Skip pins that are not muxed as GPIO by bootloader */ - if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) { +#ifdef CONFIG_OMAP_MUX + if (!superset->muxnames || !superset->muxnames[0]) { superset++; continue; } -#endif - -#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) - if (!superset->muxnames || !superset->muxnames[0]) { +#else + /* Skip pins that are not muxed as GPIO by bootloader */ + if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) { superset++; continue; }