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

Commit 3ccea0e1 authored by Andrew Lunn's avatar Andrew Lunn Committed by Greg Kroah-Hartman
Browse files

eeprom: at25: Remove in kernel API for accessing the EEPROM 



The setup() callback is not used by any in kernel code. Remove it.
Any new code which requires access to the eeprom can use the NVMEM
API.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Acked-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Acked-by: default avatarWolfram Sang <wsa@the-dreams.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 57d15550

drivers/misc/eeprom/at25.c

+0 −26
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 


struct at25_data {

	struct spi_device	*spi;

	struct memory_accessor	mem;

	struct mutex		lock;

	struct spi_eeprom	chip;

	struct bin_attribute	bin;
@@ -281,26 +280,6 @@ at25_bin_write(struct file *filp, struct kobject *kobj, 


/*-------------------------------------------------------------------------*/



/* Let in-kernel code access the eeprom data. */



static ssize_t at25_mem_read(struct memory_accessor *mem, char *buf,

			 off_t offset, size_t count)

{

	struct at25_data *at25 = container_of(mem, struct at25_data, mem);



	return at25_ee_read(at25, buf, offset, count);

}



static ssize_t at25_mem_write(struct memory_accessor *mem, const char *buf,

			  off_t offset, size_t count)

{

	struct at25_data *at25 = container_of(mem, struct at25_data, mem);



	return at25_ee_write(at25, buf, offset, count);

}



/*-------------------------------------------------------------------------*/



static int at25_fw_to_chip(struct device *dev, struct spi_eeprom *chip)

{

	u32 val;
@@ -415,22 +394,17 @@ static int at25_probe(struct spi_device *spi) 
	at25->bin.attr.name = "eeprom";

	at25->bin.attr.mode = S_IRUSR;

	at25->bin.read = at25_bin_read;

	at25->mem.read = at25_mem_read;



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

	if (!(chip.flags & EE_READONLY)) {

		at25->bin.write = at25_bin_write;

		at25->bin.attr.mode |= S_IWUSR;

		at25->mem.write = at25_mem_write;

	}



	err = sysfs_create_bin_file(&spi->dev.kobj, &at25->bin);

	if (err)

		return err;



	if (chip.setup)

		chip.setup(&at25->mem, chip.context);



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

		(at25->bin.size < 1024)

			? at25->bin.size

include/linux/spi/eeprom.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ struct spi_eeprom { 
	 */

#define EE_INSTR_BIT3_IS_ADDR	0x0010



	/* for exporting this chip's data to other kernel code */

	void (*setup)(struct memory_accessor *mem, void *context);

	void *context;

};