From patchwork Tue Feb 12 19:22:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ezequiel Garcia X-Patchwork-Id: 2130701 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 308B6DFB7B for ; Tue, 12 Feb 2013 19:22:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933264Ab3BLTWw (ORCPT ); Tue, 12 Feb 2013 14:22:52 -0500 Received: from mail.free-electrons.com ([94.23.35.102]:47141 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932165Ab3BLTWw (ORCPT ); Tue, 12 Feb 2013 14:22:52 -0500 Received: by mail.free-electrons.com (Postfix, from userid 106) id 9CB8C81F; Tue, 12 Feb 2013 20:22:51 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT shortcircuit=ham autolearn=disabled version=3.3.2 Received: from localhost.localdomain (20.222.3.200.ros.express.com.ar [200.3.222.20]) by mail.free-electrons.com (Postfix) with ESMTPA id D62977B2; Tue, 12 Feb 2013 20:22:48 +0100 (CET) From: Ezequiel Garcia To: , Cc: Jon Hunter , Felipe Balbi , Tony Lindgren , Afzal Mohammed , Ezequiel Garcia Subject: [PATCH v3 8/8] ARM: omap2: gpmc: Remove redundant chip select out of range check Date: Tue, 12 Feb 2013 16:22:24 -0300 Message-Id: <1360696944-3371-9-git-send-email-ezequiel.garcia@free-electrons.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1360696944-3371-1-git-send-email-ezequiel.garcia@free-electrons.com> References: <1360696944-3371-1-git-send-email-ezequiel.garcia@free-electrons.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This check is done before the call to gpmc_cs_reserved() and gpmc_cs_set_reserved() and it's redundant to do it again in each function. This simplifies the code a bit. Signed-off-by: Ezequiel Garcia Reviewed-by: Jon Hunter --- arch/arm/mach-omap2/gpmc.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index fa4764f..0201ea9 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -441,22 +441,14 @@ static int gpmc_cs_mem_enabled(int cs) return l & GPMC_CONFIG7_CSVALID; } -static int gpmc_cs_set_reserved(int cs, int reserved) +static void gpmc_cs_set_reserved(int cs, int reserved) { - if (cs > GPMC_CS_NUM) - return -ENODEV; - gpmc_cs_map &= ~(1 << cs); gpmc_cs_map |= (reserved ? 1 : 0) << cs; - - return 0; } static bool gpmc_cs_reserved(int cs) { - if (cs > GPMC_CS_NUM) - return true; - return gpmc_cs_map & (1 << cs); }