LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Wolfram Sang <wsa@the-dreams.de>
To: linux-i2c@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
linuxppc-dev@lists.ozlabs.org, linux-mips@linux-mips.org,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Ludovic Desroches <ludovic.desroches@atmel.com>,
Yingjoe Chen <yingjoe.chen@mediatek.com>,
Eddie Huang <eddie.huang@mediatek.com>,
Wolfram Sang <wsa@the-dreams.de>,
Jochen Friedrich <jochen@scram.de>,
linux-kernel@vger.kernel.org
Subject: [RFC V2 06/12] i2c: cpm: make use of the new infrastructure for quirks
Date: Wed, 25 Feb 2015 17:01:57 +0100 [thread overview]
Message-ID: <1424880126-15047-7-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1424880126-15047-1-git-send-email-wsa@the-dreams.de>
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
---
drivers/i2c/busses/i2c-cpm.c | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 2d466538b2e2c9..714bdc837769fd 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -308,22 +308,12 @@ static int cpm_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
struct i2c_reg __iomem *i2c_reg = cpm->i2c_reg;
struct i2c_ram __iomem *i2c_ram = cpm->i2c_ram;
struct i2c_msg *pmsg;
- int ret, i;
+ int ret;
int tptr;
int rptr;
cbd_t __iomem *tbdf;
cbd_t __iomem *rbdf;
- if (num > CPM_MAXBD)
- return -EINVAL;
-
- /* Check if we have any oversized READ requests */
- for (i = 0; i < num; i++) {
- pmsg = &msgs[i];
- if (pmsg->len >= CPM_MAX_READ)
- return -EINVAL;
- }
-
/* Reset to use first buffer */
out_be16(&i2c_ram->rbptr, in_be16(&i2c_ram->rbase));
out_be16(&i2c_ram->tbptr, in_be16(&i2c_ram->tbase));
@@ -424,10 +414,18 @@ static const struct i2c_algorithm cpm_i2c_algo = {
.functionality = cpm_i2c_func,
};
+/* CPM_MAX_READ is also limiting writes according to the code! */
+static struct i2c_adapter_quirks cpm_i2c_quirks = {
+ .max_num_msgs = CPM_MAXBD,
+ .max_read_len = CPM_MAX_READ,
+ .max_write_len = CPM_MAX_READ,
+};
+
static const struct i2c_adapter cpm_ops = {
.owner = THIS_MODULE,
.name = "i2c-cpm",
.algo = &cpm_i2c_algo,
+ .quirks = &cpm_i2c_quirks,
};
static int cpm_i2c_setup(struct cpm_i2c *cpm)
--
2.1.4
next prev parent reply other threads:[~2015-02-25 16:02 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-25 16:01 [RFC V2 00/12] i2c: describe adapter quirks in a generic way Wolfram Sang
2015-02-25 16:01 ` [RFC V2 01/12] i2c: add quirk structure to describe adapter flaws Wolfram Sang
2015-02-25 16:01 ` [RFC V2 02/12] i2c: add quirk checks to core Wolfram Sang
2015-02-25 16:01 ` [RFC V2 03/12] i2c: at91: make use of the new infrastructure for quirks Wolfram Sang
2015-03-08 8:28 ` Wolfram Sang
2015-03-09 16:11 ` Ludovic Desroches
2015-03-10 13:55 ` Ludovic Desroches
2015-03-12 14:50 ` Wolfram Sang
2015-02-25 16:01 ` [RFC V2 04/12] i2c: opal: " Wolfram Sang
2015-03-10 17:13 ` Neelesh Gupta
2015-03-10 23:12 ` Benjamin Herrenschmidt
2015-03-11 4:26 ` Neelesh Gupta
2015-03-12 14:55 ` Wolfram Sang
2015-02-25 16:01 ` [RFC V2 05/12] i2c: qup: " Wolfram Sang
2015-02-25 16:01 ` Wolfram Sang [this message]
2015-02-25 16:01 ` [RFC V2 07/12] i2c: axxia: " Wolfram Sang
2015-02-25 16:01 ` [RFC V2 08/12] i2c: dln2: " Wolfram Sang
2015-02-25 16:02 ` [RFC V2 09/12] i2c: powermac: " Wolfram Sang
2015-02-25 16:02 ` [RFC V2 10/12] i2c: viperboard: " Wolfram Sang
2015-02-25 16:02 ` [RFC V2 11/12] i2c: pmcmsp: " Wolfram Sang
2015-02-25 16:02 ` [RFC V2 12/12] i2c: bcm-iproc: " Wolfram Sang
2015-02-26 23:32 ` Ray Jui
2015-03-12 14:56 ` Wolfram Sang
2015-03-05 13:27 ` [RFC V2 00/12] i2c: describe adapter quirks in a generic way Ivan T. Ivanov
2015-03-12 14:56 ` Wolfram Sang
2015-03-14 11:14 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1424880126-15047-7-git-send-email-wsa@the-dreams.de \
--to=wsa@the-dreams.de \
--cc=benh@kernel.crashing.org \
--cc=eddie.huang@mediatek.com \
--cc=jochen@scram.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=ludovic.desroches@atmel.com \
--cc=yingjoe.chen@mediatek.com \
--subject='Re: [RFC V2 06/12] i2c: cpm: make use of the new infrastructure for quirks' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).