Merge tag 'gpmc-omap-for-v4.15' of https://github.com/rogerq/linux into next/drivers

Pull "OMAP-GPMC: driver updates for v4.15" from Roger Quadros:
* get rid of unused field in platform data structure.

* tag 'gpmc-omap-for-v4.15' of https://github.com/rogerq/linux:
  memory: omap-gpmc: Drop gpmc_status

2 files changed, 0 insertions, 3 deletions

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 7059bbda2fac..f2aef0b87bc6 100644
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -1079,7 +1079,6 @@ void gpmc_update_nand_reg(struct gpmc_nand_regs *reg, int cs)
 {
         int i;
 
-        reg->gpmc_status = NULL;        /* deprecated */
         reg->gpmc_nand_command = gpmc_base + GPMC_CS0_OFFSET +
                                 GPMC_CS_NAND_COMMAND + GPMC_CS_SIZE * cs;
         reg->gpmc_nand_address = gpmc_base + GPMC_CS0_OFFSET +
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
index 17d57a18bac5..25e267f1970c 100644
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ b/include/linux/platform_data/mtd-nand-omap2.h
@@ -63,8 +63,6 @@ struct gpmc_nand_regs {
         void __iomem    *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER];
         void __iomem    *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER];
         void __iomem    *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER];
-        /* Deprecated. Do not use */
-        void __iomem    *gpmc_status;
 };
 
 struct omap_nand_platform_data {