mtd: rawnand: allocate dynamically ONFI parameters during detection

[sfrench/cifs-2.6.git] / drivers / mtd / nand / raw / nand_timings.c

diff --git a/drivers/mtd/nand/raw/nand_timings.c b/drivers/mtd/nand/raw/nand_timings.c
index 9bb599106a31486b223b0ff8d04b97b7565b6c4e..ebc7b5f76f77b26f3971047f378e319de9749d43 100644 (file)
--- a/drivers/mtd/nand/raw/nand_timings.c
+++ b/drivers/mtd/nand/raw/nand_timings.c
@@ -294,6 +294,7 @@ int onfi_fill_data_interface(struct nand_chip *chip,
                             int timing_mode)
 {
        struct nand_data_interface *iface = &chip->data_interface;
+       struct onfi_params *onfi = chip->parameters.onfi;
 
        if (type != NAND_SDR_IFACE)
                return -EINVAL;
@@ -308,17 +309,16 @@ int onfi_fill_data_interface(struct nand_chip *chip,
         * tPROG, tBERS, tR and tCCS.
         * These information are part of the ONFI parameter page.
         */
-       if (chip->parameters.onfi.version) {
-               struct nand_parameters *params = &chip->parameters;
+       if (onfi) {
                struct nand_sdr_timings *timings = &iface->timings.sdr;
 
                /* microseconds -> picoseconds */
-               timings->tPROG_max = 1000000ULL * params->onfi.tPROG;
-               timings->tBERS_max = 1000000ULL * params->onfi.tBERS;
-               timings->tR_max = 1000000ULL * params->onfi.tR;
+               timings->tPROG_max = 1000000ULL * onfi->tPROG;
+               timings->tBERS_max = 1000000ULL * onfi->tBERS;
+               timings->tR_max = 1000000ULL * onfi->tR;
 
                /* nanoseconds -> picoseconds */
-               timings->tCCS_min = 1000UL * params->onfi.tCCS;
+               timings->tCCS_min = 1000UL * onfi->tCCS;
        } else {
                struct nand_sdr_timings *timings = &iface->timings.sdr;
                /*