2016-10-28 16:18:23 +00:00
|
|
|
From df36b4601bc9f84684249a26eb39b818d6785fb8 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Brian Norris <computersforpeace@gmail.com>
|
|
|
|
|
Date: Fri, 30 Oct 2015 20:33:27 -0700
|
|
|
|
|
Subject: [PATCH 078/113] mtd: spi-nor: drop flash_node field
|
|
|
|
|
|
|
|
|
|
We can just alias to the MTD of_node.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
|
|
|
|
|
Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/mtd/spi-nor/spi-nor.c | 1 -
|
|
|
|
|
include/linux/mtd/spi-nor.h | 6 ++----
|
|
|
|
|
2 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/mtd/spi-nor/spi-nor.c
|
|
|
|
|
+++ b/drivers/mtd/spi-nor/spi-nor.c
|
2016-12-20 08:19:08 +00:00
|
|
|
@@ -1221,7 +1221,6 @@ int spi_nor_scan(struct spi_nor *nor, co
|
2016-10-28 16:18:23 +00:00
|
|
|
mtd->flags |= MTD_NO_ERASE;
|
|
|
|
|
|
|
|
|
|
mtd->dev.parent = dev;
|
|
|
|
|
- mtd_set_of_node(mtd, np);
|
|
|
|
|
nor->page_size = info->page_size;
|
|
|
|
|
mtd->writebufsize = nor->page_size;
|
|
|
|
|
|
|
|
|
|
--- a/include/linux/mtd/spi-nor.h
|
|
|
|
|
+++ b/include/linux/mtd/spi-nor.h
|
|
|
|
|
@@ -123,7 +123,6 @@ enum spi_nor_option_flags {
|
|
|
|
|
* @mtd: point to a mtd_info structure
|
|
|
|
|
* @lock: the lock for the read/write/erase/lock/unlock operations
|
|
|
|
|
* @dev: point to a spi device, or a spi nor controller device.
|
|
|
|
|
- * @flash_node: point to a device node describing this flash instance.
|
|
|
|
|
* @page_size: the page size of the SPI NOR
|
|
|
|
|
* @addr_width: number of address bytes
|
|
|
|
|
* @erase_opcode: the opcode for erasing a sector
|
|
|
|
|
@@ -154,7 +153,6 @@ struct spi_nor {
|
|
|
|
|
struct mtd_info mtd;
|
|
|
|
|
struct mutex lock;
|
|
|
|
|
struct device *dev;
|
|
|
|
|
- struct device_node *flash_node;
|
|
|
|
|
u32 page_size;
|
|
|
|
|
u8 addr_width;
|
|
|
|
|
u8 erase_opcode;
|
|
|
|
|
@@ -187,12 +185,12 @@ struct spi_nor {
|
|
|
|
|
static inline void spi_nor_set_flash_node(struct spi_nor *nor,
|
|
|
|
|
struct device_node *np)
|
|
|
|
|
{
|
|
|
|
|
- nor->flash_node = np;
|
|
|
|
|
+ mtd_set_of_node(&nor->mtd, np);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline struct device_node *spi_nor_get_flash_node(struct spi_nor *nor)
|
|
|
|
|
{
|
|
|
|
|
- return nor->flash_node;
|
|
|
|
|
+ return mtd_get_of_node(&nor->mtd);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
