mtd: m25p80: get rid of spi_get_device_id
Subsystems (3)
PATCH 1/2 mtd: m25p80: get rid of spi_get_device_id
This simplifies the way we use spi_nor framework and will allow us to drop spi_nor_match_id.
--- drivers/mtd/devices/m25p80.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mtd/devices/m25p80.c +5 -5
@@ -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;
Signature · 1 line
1.8.4.5
PATCH 2/2 mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
From: Ben Hutchings <[email protected]>
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.
--- drivers/mtd/devices/m25p80.c | 4 +--- drivers/mtd/spi-nor/fsl-quadspi.c | 7 +------ drivers/mtd/spi-nor/spi-nor.c | 13 +++++++++---- include/linux/mtd/spi-nor.h | 20 +++----------------- 4 files changed, 14 insertions(+), 30 deletions(-)
drivers/mtd/devices/m25p80.c +1 -3
@@ -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;
drivers/mtd/spi-nor/fsl-quadspi.c +1 -6
@@ -881,7 +881,6 @@ static int fsl_qspi_probe(struct platform_device *pdev)/* iterate the subnodes. */ for_each_available_child_of_node (dev->of_node, np) { -const struct spi_device_id *id;char modalias[40 ];/* skip the holes */
@@ -909,10 +908,6 @@ static int fsl_qspi_probe(struct platform_device *pdev)if (of_modalias_node (np, modalias,sizeof (modalias)) <0 ) goto map_failed; - id =spi_nor_match_id (modalias); -if (!id) - goto map_failed; - ret =of_property_read_u32 (np,"spi-max-frequency" , &q->clk_rate);if (ret <0 )
@@ -921,7 +916,7 @@ static int fsl_qspi_probe(struct platform_device *pdev)/* set the chip address for READID */ fsl_qspi_set_base_addr (q, nor); - ret =spi_nor_scan (nor, id,SPI_NOR_QUAD ); + ret =spi_nor_scan (nor, modalias,SPI_NOR_QUAD );if (ret) goto map_failed;
drivers/mtd/spi-nor/spi-nor.c +9 -4
@@ -28,6 +28,8 @@#define JEDEC_MFR (_jedec_id) ((_jedec_id) >> 16) +static const struct spi_device_id *spi_nor_match_id (const char *name); +/* * Read the status register, returning its value in the location * Return the status register value.
@@ -911,9 +913,9 @@ static int spi_nor_check(struct spi_nor *nor)return 0 ; } -int spi_nor_scan (struct spi_nor *nor,const struct spi_device_id *id, -enum read_mode mode) +int spi_nor_scan (struct spi_nor *nor,const char *name,enum read_mode mode) { +const struct spi_device_id *id =NULL ;struct flash_info *info;struct device *dev = nor->dev;struct mtd_info *mtd = nor->mtd;
@@ -925,6 +927,10 @@ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id,if (ret)return ret; + id =spi_nor_match_id (name); +if (!id) +return -ENOENT ; + info = (void *)id->driver_data;if (info->jedec_id) {
@@ -1113,7 +1119,7 @@ int spi_nor_scan(struct spi_nor *nor, const struct spi_device_id *id, }EXPORT_SYMBOL_GPL (spi_nor_scan); -const struct spi_device_id *spi_nor_match_id (char *name) +static const struct spi_device_id *spi_nor_match_id (const char *name) {const struct spi_device_id *id = spi_nor_ids;
@@ -1124,7 +1130,6 @@ const struct spi_device_id *spi_nor_match_id(char *name) }return NULL ; } -EXPORT_SYMBOL_GPL (spi_nor_match_id);MODULE_LICENSE ("GPL" );MODULE_AUTHOR ("Huang Shijie <[email protected]>" );
include/linux/mtd/spi-nor.h +3 -17
@@ -187,32 +187,18 @@ struct spi_nor {/** * spi_nor_scan() - scan the SPI NOR * @nor: the spi_nor structure -* @id: the spi_device_id provided by the driver +* @name: the chip type name * @mode: the read mode supported by the driver * * The drivers can use this fuction to scan the SPI NOR. * In the scanning, it will try to get all the necessary information to * fill the mtd_info{} and the spi_nor{}. * -* The board may assigns a spi_device_id with @id which be used to compared with -* the spi_device_id detected by the scanning. +* The chip type name can be provided through the @name parameter. * * Return: 0 for success, others for failure. */ -int spi_nor_scan (struct spi_nor *nor,const struct spi_device_id *id, -enum read_mode mode); +int spi_nor_scan (struct spi_nor *nor,const char *name,enum read_mode mode);extern const struct spi_device_id spi_nor_ids[]; -/** -* spi_nor_match_id() - find the spi_device_id by the name -* @name: the name of the spi_device_id -* -* The drivers use this function to find the spi_device_id -* specified by the @name. -* -* Return: returns the right spi_device_id pointer on success, -* and returns NULL on failure. -*/ -const struct spi_device_id *spi_nor_match_id (char *name); -#endif
Signature · 1 line
1.8.4.5
Brian Norris
AppliedPATCH 2/2 mtd: spi-nor: make spi_nor_scan() take a chip type name, not spi_device_id
Quoted 8 lines · Rafa? Mi?ecki
From: Ben Hutchings <[email protected]>
Drivers currently call
spi_nor_match_id()and thenspi_nor_scan(). This adds a dependency on structspi_device_idwhich we want to avoid. Makespi_nor_scan()do it for them.Signed-off-by Ben Hutchings <[email protected]>Signed-off-by Rafa? Mi?ecki <[email protected]>
Pushed to l2-mtd.git/master.
Brian
PATCH 1/2 mtd: m25p80: get rid of spi_get_device_id
In reply to Rafał MiłeckiQuoted 2 lines · Rafa? Mi?ecki
This simplifies the way we use
spi_norframework and will allow us to dropspi_nor_match_id.
Please don't CC linux-spi on spi-nor patches that don't have SPI level
changes, it just clogs up patchwork.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141001/3303b81b/attachment.sig>
PATCH 1/2 mtd: m25p80: get rid of spi_get_device_id
Quoted 6 lines · Mark Brown
Quoted 2 lines · Rafa? Mi?ecki
This simplifies the way we use
spi_norframework and will allow us to dropspi_nor_match_id.Please don't CC linux-spi on spi-nor patches that don't have SPI level changes, it just clogs up patchwork.
+1 from me. I appreciate the converse, as I don't need unrelated noise on linux-mtd.
(I feel sorry for people over at linux-arm-kernel and devicetree, since they get CC'd on a large variety of unrelated things, it seems. I'm sure the firehose gets to be almost as bad as LKML sometimes.)
Brian
PATCH 1/2 mtd: m25p80: get rid of spi_get_device_id
Quoted 8 lines · Brian Norris
Quoted 6 lines · Mark Brown
Quoted 2 lines · Rafa? Mi?ecki
This simplifies the way we use
spi_norframework and will allow us to dropspi_nor_match_id.Please don't CC linux-spi on spi-nor patches that don't have SPI level changes, it just clogs up patchwork.
Quoted 6 lines
+1 from me. I appreciate the converse, as I don't need unrelated noise on linux-mtd.
(I feel sorry for people over at linux-arm-kernel and devicetree, since they get CC'd on a large variety of unrelated things, it seems. I'm sure the firehose gets to be almost as bad as LKML sometimes.)
Sorry, I usually don't. AFAIR this time I copied receivers list from the original Ben patch / discussion about auto loading.
Signature · 1 line
Rafa?
Brian Norris
AppliedPATCH 1/2 mtd: m25p80: get rid of spi_get_device_id
In reply to Rafał MiłeckiQuoted 4 lines · Rafa? Mi?ecki
This simplifies the way we use
spi_norframework and will allow us to dropspi_nor_match_id.Signed-off-by Rafa? Mi?ecki <[email protected]>
Applied to l2-mtd.git/master.
Brian