1 files changed, 14 insertions, 8 deletions

diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index d66b85692a58..9dd40e70aca3 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -65,6 +65,17 @@ static bool gpmc_hwecc_bch_capable(enum omap_ecc ecc_opt)
         return 1;
 }
 
+/* This function will go away once the device-tree convertion is complete */
+static void gpmc_set_legacy(struct omap_nand_platform_data *gpmc_nand_data,
+                            struct gpmc_settings *s)
+{
+        /* Enable RD PIN Monitoring Reg */
+        if (gpmc_nand_data->dev_ready) {
+                s->wait_on_read = true;
+                s->wait_on_write = true;
+        }
+}
+
 int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
                    struct gpmc_timings *gpmc_t)
 {
@@ -100,15 +111,10 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
                 }
         }
 
-        if (gpmc_nand_data->of_node) {
+        if (gpmc_nand_data->of_node)
                 gpmc_read_settings_dt(gpmc_nand_data->of_node, &s);
-        } else {
-                /* Enable RD PIN Monitoring Reg */
-                if (gpmc_nand_data->dev_ready) {
-                        s.wait_on_read = true;
-                        s.wait_on_write = true;
-                }
-        }
+        else
+                gpmc_set_legacy(gpmc_nand_data, &s);
 
         s.device_nand = true;