diff options
| author | Ezequiel Garcia <ezequiel.garcia@free-electrons.com> | 2013-02-12 16:22:24 -0300 |
|---|---|---|
| committer | Jon Hunter <jon-hunter@ti.com> | 2013-04-01 14:53:39 -0500 |
| commit | f5d8edaf1d06e922a3c3d75c52ef5628ceec32c4 (patch) | |
| tree | 03b4641f9dd634b99b8b19e2d3a42e57e7d3dccb /arch/arm | |
| parent | 7ab91596a55e05410fcaab6d7d066ce0e0d0a712 (diff) | |
ARM: omap2: gpmc: Remove redundant chip select out of range check
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 <ezequiel.garcia@free-electrons.com>
Reviewed-by: Jon Hunter <jon-hunter@ti.com>
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | 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 7c122bb5498..586dba7e5f2 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); } |