Commit 7692c02e authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Luis Henriques

mtd: m25p80: get rid of spi_get_device_id

commit 90e55b38 upstream.

This simplifies the way we use spi_nor framework and will allow us to
drop spi_nor_match_id.
Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent cdd8ac40
......@@ -197,6 +197,7 @@ static int m25p_probe(struct spi_device *spi)
struct m25p *flash;
struct spi_nor *nor;
enum read_mode mode = SPI_NOR_NORMAL;
char *flash_name = NULL;
int ret;
data = dev_get_platdata(&spi->dev);
......@@ -236,12 +237,11 @@ static int m25p_probe(struct spi_device *spi)
* If that's the case, respect "type" and ignore a "name".
*/
if (data && data->type)
id = spi_nor_match_id(data->type);
/* If we didn't get name from platform, simply use "modalias". */
if (!id)
id = spi_get_device_id(spi);
flash_name = data->type;
else
flash_name = spi->modalias;
id = spi_nor_match_id(flash_name);
ret = spi_nor_scan(nor, id, mode);
if (ret)
return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment