From patchwork Wed Mar 4 20:01:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [12/15] mtd: nand: drop usage of cpu_is_* macro Date: Wed, 04 Mar 2009 10:01:39 -0000 From: Andrew Morton X-Patchwork-Id: 24058 Message-Id: <200903042001.n24K1d6N028791@imap1.linux-foundation.org> To: dwmw2@infradead.org Cc: khilman@deeprootsystems.com, david-b@pacbell.net, akpm@linux-foundation.org, linux-mtd@lists.infradead.org From: Kevin Hilman 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 Cc: David Brownell Cc: David Woodhouse Signed-off-by: Andrew Morton --- drivers/mtd/nand/davinci_nand.c | 3 --- 1 file changed, 3 deletions(-) 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 #include -#include #include #include @@ -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;