Commit e2e699b1 authored Oct 27, 2013 by Ezequiel Garcia Committed by Tony Lindgren Jan 08, 2014

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>

parent b83a08fe

arch/arm/mach-omap2/gpmc-nand.c

+20 −20

Original line number	Diff line number	Diff line
		@@ -98,6 +98,7 @@ 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);
		@@ -123,7 +124,6 @@ int gpmc_nand_init(struct omap_nand_platform_data *gpmc_nand_data,
		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);