Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cdc4e7e authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Greg Kroah-Hartman
Browse files

eeprom: at24: remove nvmem_config from at24_data 



This structure only needs to exist during the call to nvmem_register().

Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
Tested-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d154316d

drivers/misc/eeprom/at24.c

+16 −16
Original line number Original line Diff line number Diff line
@@ -75,7 +75,6 @@ struct at24_data { 
	unsigned int num_addresses;

	unsigned int num_addresses;

	unsigned int offset_adj;

	unsigned int offset_adj;





	struct nvmem_config nvmem_config;

	struct nvmem_device *nvmem;

	struct nvmem_device *nvmem;





	struct gpio_desc *wp_gpio;

	struct gpio_desc *wp_gpio;
@@ -523,6 +522,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) 
	int err;

	int err;

	unsigned int i, num_addresses;

	unsigned int i, num_addresses;

	struct regmap_config regmap_config = { };

	struct regmap_config regmap_config = { };

	struct nvmem_config nvmem_config = { };

	u8 test_byte;

	u8 test_byte;





	if (client->dev.platform_data) {

	if (client->dev.platform_data) {
@@ -650,21 +650,21 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		goto err_clients;

		goto err_clients;

	}

	}





	at24->nvmem_config.name = dev_name(&client->dev);

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

	at24->nvmem_config.dev = &client->dev;

	nvmem_config.dev = &client->dev;

	at24->nvmem_config.read_only = !writable;

	nvmem_config.read_only = !writable;

	at24->nvmem_config.root_only = true;

	nvmem_config.root_only = true;

	at24->nvmem_config.owner = THIS_MODULE;

	nvmem_config.owner = THIS_MODULE;

	at24->nvmem_config.compat = true;

	nvmem_config.compat = true;

	at24->nvmem_config.base_dev = &client->dev;

	nvmem_config.base_dev = &client->dev;

	at24->nvmem_config.reg_read = at24_read;

	nvmem_config.reg_read = at24_read;

	at24->nvmem_config.reg_write = at24_write;

	nvmem_config.reg_write = at24_write;

	at24->nvmem_config.priv = at24;

	nvmem_config.priv = at24;

	at24->nvmem_config.stride = 1;

	nvmem_config.stride = 1;

	at24->nvmem_config.word_size = 1;

	nvmem_config.word_size = 1;

	at24->nvmem_config.size = chip.byte_len;

	nvmem_config.size = chip.byte_len;





	at24->nvmem = nvmem_register(&at24->nvmem_config);

	at24->nvmem = nvmem_register(&nvmem_config);





	if (IS_ERR(at24->nvmem)) {

	if (IS_ERR(at24->nvmem)) {

		err = PTR_ERR(at24->nvmem);

		err = PTR_ERR(at24->nvmem);