mtd: nand: add onfi_* stubs in case ONFI_DETECTION is disabled

Add stubs to the header in case CONFIG_SYS_NAND_ONFI_DETECTION is
disabled.  This is much easier than adding around #ifdef to the
caller side.

Also, I removed the #ifdef around onfi_params.  In Linux, onfi_params
and jedec_params are unified as union.  It will be the right thing
to do.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index d55807b2e27902fcdd4054238a5b1f522cec13d4..cba65634e6b92d411e5e76e9e0f58ef2606597ab 100644 (file)
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -741,9 +741,7 @@ struct nand_chip {
 
        int onfi_version;
        int jedec_version;
-#ifdef CONFIG_SYS_NAND_ONFI_DETECTION
        struct nand_onfi_params onfi_params;
-#endif
        struct nand_jedec_params jedec_params;
  
        int read_retries;
@@ -1001,6 +999,21 @@ static inline int onfi_get_sync_timing_mode(struct nand_chip *chip)
                return ONFI_TIMING_MODE_UNKNOWN;
        return le16_to_cpu(chip->onfi_params.src_sync_timing_mode);
 }
+#else
+static inline int onfi_feature(struct nand_chip *chip)
+{
+       return 0;
+}
+
+static inline int onfi_get_async_timing_mode(struct nand_chip *chip)
+{
+       return ONFI_TIMING_MODE_UNKNOWN;
+}
+
+static inline int onfi_get_sync_timing_mode(struct nand_chip *chip)
+{
+       return ONFI_TIMING_MODE_UNKNOWN;
+}
 #endif
 
 /*