diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:36:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 22:36:23 +0200 |
| commit | d5bd8507cf3f7fcb890b2c02bbfab26efac75795 (patch) | |
| tree | ac3f9f70b55cb7f250ac8245d34e6a2fd8266c97 | |
| parent | Merge tag 'qcom-drivers-for-4.15' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | memory: omap-gpmc: Drop gpmc_status (diff) | |
| download | linux-d5bd8507cf3f7fcb890b2c02bbfab26efac75795.tar.xz linux-d5bd8507cf3f7fcb890b2c02bbfab26efac75795.zip | |
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
| -rw-r--r-- | drivers/memory/omap-gpmc.c | 1 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-nand-omap2.h | 2 |
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 { |