From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: wsa@the-dreams.de, linux-i2c@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Subject: [PATCH v2 3/3] i2c-rcar: make rcar_i2c_irq_recv() *void*
Date: Mon, 15 Sep 2014 00:17:34 +0400 [thread overview]
Message-ID: <19871938.mRdZLUD6Mv@wasted.cogentembedded.com> (raw)
In-Reply-To: <2245366.q99HVYG3pL@wasted.cogentembedded.com>
rcar_i2c_irq_recv() always returns 0, so we can make this function return
*void* and also remove rcar_i2c_flags_set() invocation in rcar_i2c_irq().
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
Changes in version 2:
- refreshed patch.
drivers/i2c/busses/i2c-rcar.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
Index: linux/drivers/i2c/busses/i2c-rcar.c
===================================================================
--- linux.orig/drivers/i2c/busses/i2c-rcar.c
+++ linux/drivers/i2c/busses/i2c-rcar.c
@@ -319,7 +319,7 @@ static int rcar_i2c_irq_send(struct rcar
return 0;
}
-static int rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr)
+static void rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr)
{
struct i2c_msg *msg = priv->msg;
@@ -329,7 +329,7 @@ static int rcar_i2c_irq_recv(struct rcar
* Do nothing
*/
if (!(msr & MDR))
- return 0;
+ return;
if (msr & MAT) {
/*
@@ -356,8 +356,6 @@ static int rcar_i2c_irq_recv(struct rcar
rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_DATA);
rcar_i2c_write(priv, ICMSR, RCAR_IRQ_ACK_RECV);
-
- return 0;
}
static irqreturn_t rcar_i2c_irq(int irq, void *ptr)
@@ -395,7 +393,7 @@ static irqreturn_t rcar_i2c_irq(int irq,
}
if (rcar_i2c_is_recv(priv))
- rcar_i2c_flags_set(priv, rcar_i2c_irq_recv(priv, msr));
+ rcar_i2c_irq_recv(priv, msr);
else
rcar_i2c_flags_set(priv, rcar_i2c_irq_send(priv, msr));
WARNING: multiple messages have this Message-ID (diff)
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: wsa@the-dreams.de, linux-i2c@vger.kernel.org
Cc: linux-sh@vger.kernel.org
Subject: [PATCH v2 3/3] i2c-rcar: make rcar_i2c_irq_recv() *void*
Date: Sun, 14 Sep 2014 20:17:34 +0000 [thread overview]
Message-ID: <19871938.mRdZLUD6Mv@wasted.cogentembedded.com> (raw)
In-Reply-To: <2245366.q99HVYG3pL@wasted.cogentembedded.com>
rcar_i2c_irq_recv() always returns 0, so we can make this function return
*void* and also remove rcar_i2c_flags_set() invocation in rcar_i2c_irq().
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
---
Changes in version 2:
- refreshed patch.
drivers/i2c/busses/i2c-rcar.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
Index: linux/drivers/i2c/busses/i2c-rcar.c
=================================--- linux.orig/drivers/i2c/busses/i2c-rcar.c
+++ linux/drivers/i2c/busses/i2c-rcar.c
@@ -319,7 +319,7 @@ static int rcar_i2c_irq_send(struct rcar
return 0;
}
-static int rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr)
+static void rcar_i2c_irq_recv(struct rcar_i2c_priv *priv, u32 msr)
{
struct i2c_msg *msg = priv->msg;
@@ -329,7 +329,7 @@ static int rcar_i2c_irq_recv(struct rcar
* Do nothing
*/
if (!(msr & MDR))
- return 0;
+ return;
if (msr & MAT) {
/*
@@ -356,8 +356,6 @@ static int rcar_i2c_irq_recv(struct rcar
rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_DATA);
rcar_i2c_write(priv, ICMSR, RCAR_IRQ_ACK_RECV);
-
- return 0;
}
static irqreturn_t rcar_i2c_irq(int irq, void *ptr)
@@ -395,7 +393,7 @@ static irqreturn_t rcar_i2c_irq(int irq,
}
if (rcar_i2c_is_recv(priv))
- rcar_i2c_flags_set(priv, rcar_i2c_irq_recv(priv, msr));
+ rcar_i2c_irq_recv(priv, msr);
else
rcar_i2c_flags_set(priv, rcar_i2c_irq_send(priv, msr));
next prev parent reply other threads:[~2014-09-14 20:17 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-14 20:12 [PATCH v2 0/3] R-Car I2C driver: some cleanups Sergei Shtylyov
2014-09-14 20:12 ` Sergei Shtylyov
2014-09-14 20:14 ` [PATCH v2 1/3] i2c-rcar: simplify check for last message Sergei Shtylyov
2014-09-14 20:14 ` Sergei Shtylyov
2014-09-20 9:41 ` Wolfram Sang
2014-09-20 9:41 ` Wolfram Sang
2014-09-14 20:15 ` [PATCH v2 2/3] i2c-rcar: make rcar_i2c_prepare_msg() *void* Sergei Shtylyov
2014-09-14 20:15 ` Sergei Shtylyov
2014-09-20 9:44 ` Wolfram Sang
2014-09-20 9:44 ` Wolfram Sang
2014-09-14 20:17 ` Sergei Shtylyov [this message]
2014-09-14 20:17 ` [PATCH v2 3/3] i2c-rcar: make rcar_i2c_irq_recv() *void* Sergei Shtylyov
2014-09-20 9:45 ` Wolfram Sang
2014-09-20 9:45 ` 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=19871938.mRdZLUD6Mv@wasted.cogentembedded.com \
--to=sergei.shtylyov@cogentembedded.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=wsa@the-dreams.de \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.