summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
diff options
context:
space:
mode:
authorHuang Shijie2012-07-17 08:14:02 +0200
committerDavid Woodhouse2012-09-29 15:59:12 +0200
commit513d57e1db53870cdc11e60df77c57c8b3897fdf (patch)
tree06fcf3c8370cba8c83b9902602b132432b071a0e /drivers/mtd/nand/gpmi-nand/gpmi-lib.c
parentmtd: nand: davinci: add OF support for davinci nand controller (diff)
downloadkernel-qcow2-linux-513d57e1db53870cdc11e60df77c57c8b3897fdf.tar.gz
kernel-qcow2-linux-513d57e1db53870cdc11e60df77c57c8b3897fdf.tar.xz
kernel-qcow2-linux-513d57e1db53870cdc11e60df77c57c8b3897fdf.zip
mtd: gpmi: fix the compiler warnings
Signed-off-by: Huang Shijie <b32955@freescale.com> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd/nand/gpmi-nand/gpmi-lib.c')
-rw-r--r--drivers/mtd/nand/gpmi-nand/gpmi-lib.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
index 6bb0998dcb40..2289cf8dc35b 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-lib.c
@@ -26,7 +26,7 @@
#include "gpmi-regs.h"
#include "bch-regs.h"
-struct timing_threshod timing_default_threshold = {
+static struct timing_threshod timing_default_threshold = {
.max_data_setup_cycles = (BM_GPMI_TIMING0_DATA_SETUP >>
BP_GPMI_TIMING0_DATA_SETUP),
.internal_data_setup_in_ns = 0,
@@ -738,7 +738,7 @@ void gpmi_begin(struct gpmi_nand_data *this)
{
struct resources *r = &this->resources;
struct timing_threshod *nfc = &timing_default_threshold;
- unsigned char *gpmi_regs = r->gpmi_regs;
+ void __iomem *gpmi_regs = r->gpmi_regs;
unsigned int clock_period_in_ns;
uint32_t reg;
unsigned int dll_wait_time_in_us;