diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2014-09-29 11:47:54 +0200 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2014-10-17 09:29:21 -0700 |
| commit | 70f3ce0510afdad7cbaf27ab7ab961377205c782 (patch) | |
| tree | 29df1a4e2259f90e0d2a1d35a7c8484688dc6253 /drivers/mtd/devices/m25p80.c | |
| parent | 90e55b3812a1245bb674afcc4410ddba7db402f6 (diff) | |
| download | linux-stable-70f3ce0510afdad7cbaf27ab7ab961377205c782.tar.gz linux-stable-70f3ce0510afdad7cbaf27ab7ab961377205c782.tar.bz2 linux-stable-70f3ce0510afdad7cbaf27ab7ab961377205c782.zip | |
mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
Drivers currently call spi_nor_match_id() and then spi_nor_scan().
This adds a dependency on struct spi_device_id which we want to
avoid. Make spi_nor_scan() do it for them.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/devices/m25p80.c')
| -rw-r--r-- | drivers/mtd/devices/m25p80.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 822209d10689..bd5e4c6edfd4 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c @@ -193,7 +193,6 @@ static int m25p_probe(struct spi_device *spi) { struct mtd_part_parser_data ppdata; struct flash_platform_data *data; - const struct spi_device_id *id = NULL; struct m25p *flash; struct spi_nor *nor; enum read_mode mode = SPI_NOR_NORMAL; @@ -241,8 +240,7 @@ static int m25p_probe(struct spi_device *spi) else flash_name = spi->modalias; - id = spi_nor_match_id(flash_name); - ret = spi_nor_scan(nor, id, mode); + ret = spi_nor_scan(nor, flash_name, mode); if (ret) return ret; |