diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-30 21:25:33 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-25 09:27:28 +0200 |
| commit | 2f1d3b49d1d069f8e9f2299d2d884d4653cca869 (patch) | |
| tree | f27240950dcf3ee89e71867f111cdf8a5cf6d2d4 /drivers/mtd | |
| parent | 1145c2fb1e94b50ff2618637696317153c72f8ac (diff) | |
| download | barebox-2f1d3b49d1d069f8e9f2299d2d884d4653cca869.tar.gz barebox-2f1d3b49d1d069f8e9f2299d2d884d4653cca869.tar.xz | |
mtd omap: add prefix to omap specific decode_bch function
So that it does not collide with our generic decode_bch function.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/nand/nand_omap_bch_decoder.c | 2 | ||||
| -rw-r--r-- | drivers/mtd/nand/nand_omap_gpmc.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/nand/nand_omap_bch_decoder.c b/drivers/mtd/nand/nand_omap_bch_decoder.c index d1455e4876..64e8031785 100644 --- a/drivers/mtd/nand/nand_omap_bch_decoder.c +++ b/drivers/mtd/nand/nand_omap_bch_decoder.c @@ -366,7 +366,7 @@ static void syndrome(unsigned int select_4_8, * Number of errors that can be corrected: 4- or 8-bits * Length of information bit: kk = nn - rr */ -int decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc) +int omap_gpmc_decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc) { int no_of_err; unsigned int syn[16] = {0,}; /* 16 Syndromes */ diff --git a/drivers/mtd/nand/nand_omap_gpmc.c b/drivers/mtd/nand/nand_omap_gpmc.c index d55dcaad42..86d45748ed 100644 --- a/drivers/mtd/nand/nand_omap_gpmc.c +++ b/drivers/mtd/nand/nand_omap_gpmc.c @@ -90,7 +90,7 @@ #define GPMC_ECC_SIZE_CONFIG_ECCSIZE0(x) ((x) << 12) #define GPMC_ECC_SIZE_CONFIG_ECCSIZE1(x) ((x) << 22) -int decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc); +int omap_gpmc_decode_bch(int select_4_8, unsigned char *ecc, unsigned int *err_loc); static char *ecc_mode_strings[] = { "software", @@ -400,7 +400,7 @@ static int omap_correct_bch(struct mtd_info *mtd, uint8_t *dat, count = 0; if (eccflag == 1) { - count = decode_bch(select_4_8, calc_ecc, err_loc); + count = omap_gpmc_decode_bch(select_4_8, calc_ecc, err_loc); if (count < 0) return count; else |