From: Grygorii Strashko <grygorii.strashko@ti.com>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: <linux-i2c@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Grygorii Strashko <grygorii.strashko@ti.com>,
Sekhar Nori <nsekhar@ti.com>,
Kevin Hilman <khilman@deeprootsystems.com>,
Santosh Shilimkar <ssantosh@kernel.org>,
Murali Karicheri <m-karicheri2@ti.com>
Subject: [PATCH 3/5] i2c: recovery: change input parameter to i2c_adapter for prepare/unprepare_recovery
Date: Thu, 20 Nov 2014 12:03:06 +0200 [thread overview]
Message-ID: <1416477788-5544-4-git-send-email-grygorii.strashko@ti.com> (raw)
In-Reply-To: <1416477788-5544-1-git-send-email-grygorii.strashko@ti.com>
This patch changes type of input parameter for .prepare/unprepare_recovery()
callbacks from struct i2c_bus_recovery_info * to struct i2c_adapter *.
This allows to simplify implementation of these callbacks and avoid
type conversations from i2c_bus_recovery_info to i2c_adapter.
The i2c_bus_recovery_info can be simply retrieved from struct i2c_adapter
which contains pointer on it.
CC: Sekhar Nori <nsekhar@ti.com>
CC: Kevin Hilman <khilman@deeprootsystems.com>
CC: Santosh Shilimkar <ssantosh@kernel.org>
CC: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/i2c/i2c-core.c | 4 ++--
include/linux/i2c.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index 2f90ac6..72b6e34 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -563,7 +563,7 @@ static int i2c_generic_recovery(struct i2c_adapter *adap)
int i = 0, val = 1, ret = 0;
if (bri->prepare_recovery)
- bri->prepare_recovery(bri);
+ bri->prepare_recovery(adap);
/*
* By this time SCL is high, as we need to give 9 falling-rising edges
@@ -588,7 +588,7 @@ static int i2c_generic_recovery(struct i2c_adapter *adap)
}
if (bri->unprepare_recovery)
- bri->unprepare_recovery(bri);
+ bri->unprepare_recovery(adap);
return ret;
}
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index b556e0a..cf9380f 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -404,8 +404,8 @@ struct i2c_bus_recovery_info {
void (*set_scl)(struct i2c_adapter *, int val);
int (*get_sda)(struct i2c_adapter *);
- void (*prepare_recovery)(struct i2c_bus_recovery_info *bri);
- void (*unprepare_recovery)(struct i2c_bus_recovery_info *bri);
+ void (*prepare_recovery)(struct i2c_adapter *);
+ void (*unprepare_recovery)(struct i2c_adapter *);
/* gpio recovery */
int scl_gpio;
--
1.9.1
next prev parent reply other threads:[~2014-11-20 10:05 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-20 10:03 [PATCH 0/5] i2c: davinci improvements and fixes Grygorii Strashko
2014-11-20 10:03 ` [PATCH 1/5] i2c: i2c-davinci: switch to use platform_get_irq Grygorii Strashko
2014-11-20 21:48 ` [1/5] " Uwe Kleine-König
2014-11-21 11:01 ` Grygorii Strashko
2014-11-21 14:03 ` Rob Herring
2014-11-21 14:59 ` Grygorii Strashko
2014-11-20 10:03 ` [PATCH 2/5] i2c: davinci: query STP always when NACK is received Grygorii Strashko
2014-11-20 22:19 ` [2/5] " Uwe Kleine-König
2014-11-21 12:48 ` Grygorii Strashko
2014-11-21 13:10 ` Uwe Kleine-König
2014-11-21 15:33 ` Grygorii Strashko
2014-11-23 20:33 ` Uwe Kleine-König
2014-11-24 13:34 ` Grygorii Strashko
2014-11-24 20:02 ` Uwe Kleine-König
2014-11-20 10:03 ` Grygorii Strashko [this message]
2014-11-21 18:49 ` [3/5] i2c: recovery: change input parameter to i2c_adapter for prepare/unprepare_recovery Uwe Kleine-König
2014-11-20 10:03 ` [PATCH 4/5] i2c: davinci: use bus recovery infrastructure Grygorii Strashko
2014-11-21 19:07 ` [4/5] " Uwe Kleine-König
2014-11-21 19:33 ` Grygorii Strashko
2014-11-23 20:36 ` Uwe Kleine-König
2014-11-24 13:26 ` Grygorii Strashko
2014-11-24 20:07 ` Uwe Kleine-König
2014-11-20 10:03 ` [PATCH 5/5] i2c: davinci: use ICPFUNC to toggle I2C as gpio for bus recovery Grygorii Strashko
2014-11-23 17:04 ` [5/5] " Uwe Kleine-König
2014-11-24 13:15 ` Grygorii Strashko
2014-11-24 18:13 ` Mike Looijmans
2014-11-24 19:22 ` Grygorii Strashko
2014-11-24 19:45 ` Uwe Kleine-König
2014-11-25 13:04 ` Grygorii Strashko
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=1416477788-5544-4-git-send-email-grygorii.strashko@ti.com \
--to=grygorii.strashko@ti.com \
--cc=khilman@deeprootsystems.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=m-karicheri2@ti.com \
--cc=nsekhar@ti.com \
--cc=ssantosh@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®