From: Syed Mohammed Khasim x0khasim@ti.com Date: Mon, 11 Dec 2006 21:58:29 +0000 (-0800) Subject: ARM: OMAP: GPMC driver warning fix X-Git-Tag: v2.6.19-omap1~11 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bfea6da26fef418f7d7afa1020146a13c2810bdc;p=linux-2.6-omap-h63xx.git ARM: OMAP: GPMC driver warning fix To fix return type for GPMC api. Signed-off-by: Syed Mohammed Khasim Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 3c5ff959059..629af02ae04 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -264,13 +264,14 @@ static int gpmc_cs_mem_enabled(int cs) return l & (1 << 6); } -void gpmc_cs_set_reserved(int cs, int reserved) +int 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; } int gpmc_cs_reserved(int cs) diff --git a/include/asm-arm/arch-omap/gpmc.h b/include/asm-arm/arch-omap/gpmc.h index c49b2622f68..434672df702 100644 --- a/include/asm-arm/arch-omap/gpmc.h +++ b/include/asm-arm/arch-omap/gpmc.h @@ -88,7 +88,7 @@ extern int gpmc_cs_calc_divider(int cs, unsigned int sync_clk); extern int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t); extern int gpmc_cs_request(int cs, unsigned long size, unsigned long *base); extern void gpmc_cs_free(int cs); -extern void gpmc_cs_set_reserved(int cs, int reserved); +extern int gpmc_cs_set_reserved(int cs, int reserved); extern int gpmc_cs_reserved(int cs); #endif