From 0395d3b285dbf71c57996066c668e8eb6a33dfa6 Mon Sep 17 00:00:00 2001 From: Ezequiel Garcia Date: Tue, 12 Feb 2013 16:22:24 -0300 Subject: [PATCH] --- yaml --- r: 372337 b: refs/heads/master c: f5d8edaf1d06e922a3c3d75c52ef5628ceec32c4 h: refs/heads/master i: 372335: bd08d9d80e75b86070d43dbb7235337acee17aa7 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/gpmc.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 1ca3096442db..b5d2b807206b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7ab91596a55e05410fcaab6d7d066ce0e0d0a712 +refs/heads/master: f5d8edaf1d06e922a3c3d75c52ef5628ceec32c4 diff --git a/trunk/arch/arm/mach-omap2/gpmc.c b/trunk/arch/arm/mach-omap2/gpmc.c index 7c122bb5498a..586dba7e5f23 100644 --- a/trunk/arch/arm/mach-omap2/gpmc.c +++ b/trunk/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); }