From patchwork Wed Oct 31 15:56:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pantelis Antoniou X-Patchwork-Id: 1671911 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 90310DFB7B for ; Tue, 30 Oct 2012 18:14:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965225Ab2J3SMr (ORCPT ); Tue, 30 Oct 2012 14:12:47 -0400 Received: from li42-95.members.linode.com ([209.123.162.95]:59057 "EHLO li42-95.members.linode.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934073Ab2J3SMp (ORCPT ); Tue, 30 Oct 2012 14:12:45 -0400 Received: from sles11esa.localdomain (unknown [195.97.110.117]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: panto) by li42-95.members.linode.com (Postfix) with ESMTPSA id E5DE49C1EE; Tue, 30 Oct 2012 18:03:41 +0000 (UTC) From: Pantelis Antoniou To: Wolfram Sang Cc: Pantelis Antoniou , "Ben Dooks (embedded platforms)" , linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org, Koen Kooi , Matt Porter , Russ Dill , linux-omap@vger.kernel.org Subject: [PATCH] i2c-EEPROM: Export memory accessor Date: Wed, 31 Oct 2012 17:56:49 +0200 Message-Id: <1351699009-4217-1-git-send-email-panto@antoniou-consulting.com> X-Mailer: git-send-email 1.7.12 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Various platforms need access to the EEPROM in other places besides their platform registration callbacks. Export the memory accessor to the i2c_client and implement it for the at24 driver. And before you ask, no, the platform callback can't be used for anything that depends on DT. Signed-off-by: Pantelis Antoniou --- drivers/misc/eeprom/at24.c | 5 +++++ include/linux/i2c.h | 24 ++++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c index ab1ad41..4f88ae65 100644 --- a/drivers/misc/eeprom/at24.c +++ b/drivers/misc/eeprom/at24.c @@ -609,6 +609,9 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) at24->client[0] = client; + /* export accessor */ + client->macc = &at24->macc; + /* use dummy devices for multiple-address chips */ for (i = 1; i < num_addresses; i++) { at24->client[i] = i2c_new_dummy(client->adapter, @@ -619,6 +622,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) err = -EADDRINUSE; goto err_clients; } + at24->client[i]->macc = &at24->macc; } err = sysfs_create_bin_file(&client->dev.kobj, &at24->bin); @@ -637,6 +641,7 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) I2C_SMBUS_WORD_DATA ? "word" : "byte"); } + /* export data to kernel code */ if (chip.setup) chip.setup(&at24->macc, chip.context); diff --git a/include/linux/i2c.h b/include/linux/i2c.h index 800de22..e20ad4e 100644 --- a/include/linux/i2c.h +++ b/include/linux/i2c.h @@ -33,6 +33,7 @@ #include /* for struct device_node */ #include /* for swab16 */ #include +#include extern struct bus_type i2c_bus_type; extern struct device_type i2c_adapter_type; @@ -229,9 +230,32 @@ struct i2c_client { struct device dev; /* the device structure */ int irq; /* irq issued by device */ struct list_head detected; + + /* export accessor */ + struct memory_accessor *macc; }; #define to_i2c_client(d) container_of(d, struct i2c_client, dev) +static inline ssize_t i2c_memory_read(struct i2c_client *client, char *buf, off_t offset, + size_t count) +{ + struct memory_accessor *macc = client->macc; + + if (macc == NULL || macc->read == NULL) + return -ENODEV; + return (*client->macc->read)(macc, buf, offset, count); +} + +static inline ssize_t i2c_memory_write(struct i2c_client *client, const char *buf, off_t offset, + size_t count) +{ + struct memory_accessor *macc = client->macc; + + if (macc == NULL || macc->write == NULL) + return -ENODEV; + return (*client->macc->write)(macc, buf, offset, count); +} + extern struct i2c_client *i2c_verify_client(struct device *dev); extern struct i2c_adapter *i2c_verify_adapter(struct device *dev);