Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 372337
b: refs/heads/master
c: f5d8eda
h: refs/heads/master
i:
  372335: bd08d9d
v: v3
  • Loading branch information
Ezequiel Garcia authored and Jon Hunter committed Apr 1, 2013
1 parent e1c4826 commit 0395d3b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7ab91596a55e05410fcaab6d7d066ce0e0d0a712
refs/heads/master: f5d8edaf1d06e922a3c3d75c52ef5628ceec32c4
10 changes: 1 addition & 9 deletions trunk/arch/arm/mach-omap2/gpmc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 0395d3b

Please sign in to comment.