Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into merge

2 files changed, 98 insertions, 27 deletions

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index d4775528abc6..d184dfab9631 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -53,6 +53,7 @@
 
 struct at24_data {
         struct at24_platform_data chip;
+        struct memory_accessor macc;
         bool use_smbus;
 
         /*
@@ -225,14 +226,11 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
                 return status;
 }
 
-static ssize_t at24_bin_read(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t at24_read(struct at24_data *at24,
                 char *buf, loff_t off, size_t count)
 {
-        struct at24_data *at24;
         ssize_t retval = 0;
 
-        at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));
-
         if (unlikely(!count))
                 return count;
 
@@ -262,12 +260,14 @@ static ssize_t at24_bin_read(struct kobject *kobj, struct bin_attribute *attr,
         return retval;
 }
 
+static ssize_t at24_bin_read(struct kobject *kobj, struct bin_attribute *attr,
+                char *buf, loff_t off, size_t count)
+{
+        struct at24_data *at24;
 
-/*
- * REVISIT: export at24_bin{read,write}() to let other kernel code use
- * eeprom data. For example, it might hold a board's Ethernet address, or
- * board-specific calibration data generated on the manufacturing floor.
- */
+        at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));
+        return at24_read(at24, buf, off, count);
+}
 
 
 /*
@@ -347,14 +347,11 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, char *buf,
         return -ETIMEDOUT;
 }
 
-static ssize_t at24_bin_write(struct kobject *kobj, struct bin_attribute *attr,
+static ssize_t at24_write(struct at24_data *at24,
                 char *buf, loff_t off, size_t count)
 {
-        struct at24_data *at24;
         ssize_t retval = 0;
 
-        at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));
-
         if (unlikely(!count))
                 return count;
 
@@ -384,6 +381,39 @@ static ssize_t at24_bin_write(struct kobject *kobj, struct bin_attribute *attr,
         return retval;
 }
 
+static ssize_t at24_bin_write(struct kobject *kobj, struct bin_attribute *attr,
+                char *buf, loff_t off, size_t count)
+{
+        struct at24_data *at24;
+
+        at24 = dev_get_drvdata(container_of(kobj, struct device, kobj));
+        return at24_write(at24, buf, off, count);
+}
+
+/*-------------------------------------------------------------------------*/
+
+/*
+ * This lets other kernel code access the eeprom data. For example, it
+ * might hold a board's Ethernet address, or board-specific calibration
+ * data generated on the manufacturing floor.
+ */
+
+static ssize_t at24_macc_read(struct memory_accessor *macc, char *buf,
+                         off_t offset, size_t count)
+{
+        struct at24_data *at24 = container_of(macc, struct at24_data, macc);
+
+        return at24_read(at24, buf, offset, count);
+}
+
+static ssize_t at24_macc_write(struct memory_accessor *macc, char *buf,
+                          off_t offset, size_t count)
+{
+        struct at24_data *at24 = container_of(macc, struct at24_data, macc);
+
+        return at24_write(at24, buf, offset, count);
+}
+
 /*-------------------------------------------------------------------------*/
 
 static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
@@ -413,6 +443,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
                  * is recommended anyhow.
                  */
                 chip.page_size = 1;
+
+                chip.setup = NULL;
+                chip.context = NULL;
         }
 
         if (!is_power_of_2(chip.byte_len))
@@ -463,6 +496,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
         at24->bin.read = at24_bin_read;
         at24->bin.size = chip.byte_len;
 
+        at24->macc.read = at24_macc_read;
+
         writable = !(chip.flags & AT24_FLAG_READONLY);
         if (writable) {
                 if (!use_smbus || i2c_check_functionality(client->adapter,
@@ -470,6 +505,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
 
                         unsigned write_max = chip.page_size;
 
+                        at24->macc.write = at24_macc_write;
+
                         at24->bin.write = at24_bin_write;
                         at24->bin.attr.mode |= S_IWUSR;
 
@@ -520,6 +557,10 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
                 at24->write_max,
                 use_smbus ? ", use_smbus" : "");
 
+        /* export data to kernel code */
+        if (chip.setup)
+                chip.setup(&at24->macc, chip.context);
+
         return 0;
 
 err_clients:
diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
index 290dbe99647a..6bc0dac5c1e8 100644
--- a/drivers/misc/eeprom/at25.c
+++ b/drivers/misc/eeprom/at25.c
@@ -30,6 +30,7 @@
 
 struct at25_data {
         struct spi_device       *spi;
+        struct memory_accessor  mem;
         struct mutex            lock;
         struct spi_eeprom       chip;
         struct bin_attribute    bin;
@@ -75,6 +76,13 @@ at25_ee_read(
         struct spi_transfer     t[2];
         struct spi_message      m;
 
+        if (unlikely(offset >= at25->bin.size))
+                return 0;
+        if ((offset + count) > at25->bin.size)
+                count = at25->bin.size - offset;
+        if (unlikely(!count))
+                return count;
+
         cp = command;
         *cp++ = AT25_READ;
 
@@ -127,13 +135,6 @@ at25_bin_read(struct kobject *kobj, struct bin_attribute *bin_attr,
         dev = container_of(kobj, struct device, kobj);
         at25 = dev_get_drvdata(dev);
 
-        if (unlikely(off >= at25->bin.size))
-                return 0;
-        if ((off + count) > at25->bin.size)
-                count = at25->bin.size - off;
-        if (unlikely(!count))
-                return count;
-
         return at25_ee_read(at25, buf, off, count);
 }
 
@@ -146,6 +147,13 @@ at25_ee_write(struct at25_data *at25, char *buf, loff_t off, size_t count)
         unsigned                buf_size;
         u8                      *bounce;
 
+        if (unlikely(off >= at25->bin.size))
+                return -EFBIG;
+        if ((off + count) > at25->bin.size)
+                count = at25->bin.size - off;
+        if (unlikely(!count))
+                return count;
+
         /* Temp buffer starts with command and address */
         buf_size = at25->chip.page_size;
         if (buf_size > io_limit)
@@ -253,18 +261,31 @@ at25_bin_write(struct kobject *kobj, struct bin_attribute *bin_attr,
         dev = container_of(kobj, struct device, kobj);
         at25 = dev_get_drvdata(dev);
 
-        if (unlikely(off >= at25->bin.size))
-                return -EFBIG;
-        if ((off + count) > at25->bin.size)
-                count = at25->bin.size - off;
-        if (unlikely(!count))
-                return count;
-
         return at25_ee_write(at25, buf, off, count);
 }
 
 /*-------------------------------------------------------------------------*/
 
+/* 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, 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_probe(struct spi_device *spi)
 {
         struct at25_data        *at25 = NULL;
@@ -317,6 +338,10 @@ static int at25_probe(struct spi_device *spi)
         at25->addrlen = addrlen;
 
         /* Export the EEPROM bytes through sysfs, since that's convenient.
+         * And maybe to other kernel code; it might hold a board's Ethernet
+         * address, or board-specific calibration data generated on the
+         * manufacturing floor.
+         *
          * Default to root-only access to the data; EEPROMs often hold data
          * that's sensitive for read and/or write, like ethernet addresses,
          * security codes, board-specific manufacturing calibrations, etc.
@@ -324,17 +349,22 @@ 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)
                 goto fail;
 
+        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