ARM: OMAP2+: gpmc: Move initialization outside the gpmc_t condition

This commit moves a bunch of initialization previously enclosed
under a 'if (gpmc_t)' check, to be outside such condition.

These initializations are not related to gpmc_t (timings) in any way
so it's nonsense to enclose them under such check.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

1 files changed, 20 insertions, 20 deletions

diff --git a/arch/arm/mach-omap2/gpmc-nand.c b/arch/arm/mach-omap2/gpmc-nand.c
index 662c7fd633cc..d66b85692a58 100644
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@ -98,32 +98,32 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
                         dev_err(dev, "Unable to set gpmc timings: %d\n", err);
                         return err;
                 }
+        }
 
-                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;
-                        }
+        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;
                 }
+        }
 
-                s.device_nand = true;
+        s.device_nand = true;
 
-                if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
-                        s.device_width = GPMC_DEVWIDTH_16BIT;
-                else
-                        s.device_width = GPMC_DEVWIDTH_8BIT;
+        if (gpmc_nand_data->devsize == NAND_BUSWIDTH_16)
+                s.device_width = GPMC_DEVWIDTH_16BIT;
+        else
+                s.device_width = GPMC_DEVWIDTH_8BIT;
 
-                err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);
-                if (err < 0)
-                        goto out_free_cs;
+        err = gpmc_cs_program_settings(gpmc_nand_data->cs, &s);
+        if (err < 0)
+                goto out_free_cs;
 
-                err = gpmc_configure(GPMC_CONFIG_WP, 0);
-                if (err < 0)
-                        goto out_free_cs;
-        }
+        err = gpmc_configure(GPMC_CONFIG_WP, 0);
+        if (err < 0)
+                goto out_free_cs;
 
         gpmc_update_nand_reg(&gpmc_nand_data->reg, gpmc_nand_data->cs);