Patchwork [12/15] mtd: nand: drop usage of cpu_is_* macro

login
register
mail settings
Submitter Andrew Morton
Date March 4, 2009, 8:01 p.m.
Message ID <200903042001.n24K1d6N028791@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/24058/
State New
Headers show

Comments

Andrew Morton - March 4, 2009, 8:01 p.m.
From: Kevin Hilman <khilman@deeprootsystems.com>

Usage of davinci-specific cpu_is macros is not allowed in drivers. 
These options should be passed in through platform_data.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Cc: David Brownell <david-b@pacbell.net>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/mtd/nand/davinci_nand.c |    3 ---
 1 file changed, 3 deletions(-)

Patch

diff -puN drivers/mtd/nand/davinci_nand.c~mtd-nand-drop-usage-of-cpu_is_-macro drivers/mtd/nand/davinci_nand.c
--- a/drivers/mtd/nand/davinci_nand.c~mtd-nand-drop-usage-of-cpu_is_-macro
+++ a/drivers/mtd/nand/davinci_nand.c
@@ -33,7 +33,6 @@ 
 #include <linux/mtd/nand.h>
 #include <linux/mtd/partitions.h>
 
-#include <mach/cpu.h>
 #include <mach/nand.h>
 
 #include <asm/mach-types.h>
@@ -392,8 +391,6 @@  static int __init nand_davinci_probe(str
 	/* use board-specific ECC config; else, the best available */
 	if (pdata)
 		ecc_mode = pdata->ecc_mode;
-	else if (cpu_is_davinci_dm355())
-		ecc_mode = NAND_ECC_HW_SYNDROME;
 	else
 		ecc_mode = NAND_ECC_HW;