hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nvmem: eeprom: at25: fram discovery simplification 

Changed "is_fram" to bool and set it based on compatible string.

Signed-off-by: Jiri Prchal <jiri.prchal@aksignal.cz>
Link: https://lore.kernel.org/r/20210611152416.68386-1-jiri.prchal@aksignal.cz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jiri Prchal 2021-06-11 17:24:16 +02:00 committed by Greg Kroah-Hartman
parent 604288bc61
commit eab61fb1cc
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/misc/eeprom/at25.c
View File

@ -69,9 +69,6 @@ struct at25_data {
*/
#define EE_TIMEOUT 25
#define IS_EEPROM 0
#define IS_FRAM 1
/*-------------------------------------------------------------------------*/
#define io_limit PAGE_SIZE /* bytes */
@ -363,8 +360,8 @@ static int at25_fw_to_chip(struct device *dev, struct spi_eeprom *chip)
}
static const struct of_device_id at25_of_match[] = {
{ .compatible = "atmel,at25", .data = (const void *)IS_EEPROM },
{ .compatible = "cypress,fm25", .data = (const void *)IS_FRAM },
{ .compatible = "atmel,at25",},
{ .compatible = "cypress,fm25",},
{ }
};
MODULE_DEVICE_TABLE(of, at25_of_match);
@ -379,11 +376,11 @@ static int at25_probe(struct spi_device *spi)
u8 sernum[FM25_SN_LEN];
int i;
const struct of_device_id *match;
unsigned long is_fram = 0;
bool is_fram = 0;
match = of_match_device(of_match_ptr(at25_of_match), &spi->dev);
if (match)
is_fram = (unsigned long)match->data;
if (match && !strcmp(match->compatible, "cypress,fm25"))
is_fram = 1;
/* Chip description */
if (!spi->dev.platform_data) {