iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mtd: m25p80: get rid of spi_get_device_id

Browse Source 
This simplifies the way we use spi_nor framework and will allow us to
drop spi_nor_match_id.

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Rafał Miłecki 2014-09-29 11:47:53 +02:00 committed by Brian Norris
parent 8b3d58e554
commit 90e55b3812
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mtd/devices/m25p80.c
View File

@ -197,6 +197,7 @@ static int m25p_probe(struct spi_device *spi)
struct m25p *flash; struct m25p *flash;
struct spi_nor *nor; struct spi_nor *nor;
enum read_mode mode = SPI_NOR_NORMAL; enum read_mode mode = SPI_NOR_NORMAL;
char *flash_name = NULL;
int ret; int ret;
data = dev_get_platdata(&spi->dev); 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 that's the case, respect "type" and ignore a "name".
*/ */
if (data && data->type) if (data && data->type)
id = spi_nor_match_id(data->type); flash_name = data->type;
else
/* If we didn't get name from platform, simply use "modalias". */ flash_name = spi->modalias;
if (!id)
id = spi_get_device_id(spi);
id = spi_nor_match_id(flash_name);
ret = spi_nor_scan(nor, id, mode); ret = spi_nor_scan(nor, id, mode);
if (ret) if (ret)
return ret; return ret;