Commit 51902c12 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

misc: at25: Use at25->chip instead of local chip everywhere in ->probe() 



Currently some values are compared against the contents of the chip structure
and most are from its updated copy in at25->chip. Use the latter one everywhere
in ->probe().

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20211125213203.86693-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 58589a75

drivers/misc/eeprom/at25.c

+7 −7
Original line number Diff line number Diff line
@@ -434,8 +434,8 @@ static int at25_probe(struct spi_device *spi) 
			return -ENODEV;

		}



		chip.byte_len = int_pow(2, id[7] - 0x21 + 4) * 1024;

		if (chip.byte_len > 64 * 1024)

		at25->chip.byte_len = int_pow(2, id[7] - 0x21 + 4) * 1024;

		if (at25->chip.byte_len > 64 * 1024)

			at25->chip.flags |= EE_ADDR3;

		else

			at25->chip.flags |= EE_ADDR2;
@@ -466,7 +466,7 @@ static int at25_probe(struct spi_device *spi) 
	at25->nvmem_config.type = is_fram ? NVMEM_TYPE_FRAM : NVMEM_TYPE_EEPROM;

	at25->nvmem_config.name = dev_name(&spi->dev);

	at25->nvmem_config.dev = &spi->dev;

	at25->nvmem_config.read_only = chip.flags & EE_READONLY;

	at25->nvmem_config.read_only = at25->chip.flags & EE_READONLY;

	at25->nvmem_config.root_only = true;

	at25->nvmem_config.owner = THIS_MODULE;

	at25->nvmem_config.compat = true;
@@ -476,17 +476,17 @@ static int at25_probe(struct spi_device *spi) 
	at25->nvmem_config.priv = at25;

	at25->nvmem_config.stride = 1;

	at25->nvmem_config.word_size = 1;

	at25->nvmem_config.size = chip.byte_len;

	at25->nvmem_config.size = at25->chip.byte_len;



	at25->nvmem = devm_nvmem_register(&spi->dev, &at25->nvmem_config);

	if (IS_ERR(at25->nvmem))

		return PTR_ERR(at25->nvmem);



	dev_info(&spi->dev, "%d %s %s %s%s, pagesize %u\n",

		 (chip.byte_len < 1024) ? chip.byte_len : (chip.byte_len / 1024),

		 (chip.byte_len < 1024) ? "Byte" : "KByte",

		 (at25->chip.byte_len < 1024) ? at25->chip.byte_len : (at25->chip.byte_len / 1024),

		 (at25->chip.byte_len < 1024) ? "Byte" : "KByte",

		 at25->chip.name, is_fram ? "fram" : "eeprom",

		 (chip.flags & EE_READONLY) ? " (readonly)" : "",

		 (at25->chip.flags & EE_READONLY) ? " (readonly)" : "",

		 at25->chip.page_size);

	return 0;

}