redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Brian Norris 2015-10-30 20:33:27 -07:00
parent df02c885f8
commit 30069af734
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/mtd/spi-nor/spi-nor.c
View File

@ -1258,7 +1258,6 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
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;

6
include/linux/mtd/spi-nor.h
View File

@ -124,7 +124,6 @@ struct mtd_info;
* @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
@ -155,7 +154,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;
@ -188,12 +186,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);
}
/**