leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i2c: tegra-bpmp: convert to use new atomic callbacks

Browse Source 
The driver did handle this internally, convert it to use the new
callbacks.

Reviewed-by: Timo Alho <talho@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
Wolfram Sang
2019-04-03 14:40:14 +02:00
committed by Wolfram Sang
parent 89f845a6dc
commit 08960b022f
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/i2c/busses/i2c-tegra-bpmp.c
View File

@@ -207,7 +207,8 @@ static int tegra_bpmp_i2c_msg_len_check(struct i2c_msg *msgs, unsigned int num)
static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c, static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c,
struct mrq_i2c_request *request, struct mrq_i2c_request *request,
struct mrq_i2c_response *response) struct mrq_i2c_response *response,
bool atomic)
{ {
struct tegra_bpmp_message msg; struct tegra_bpmp_message msg;
int err; int err;
@@ -222,7 +223,7 @@ static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c,
msg.rx.data = response; msg.rx.data = response;
msg.rx.size = sizeof(*response); msg.rx.size = sizeof(*response);
if (irqs_disabled()) if (atomic)
err = tegra_bpmp_transfer_atomic(i2c->bpmp, &msg); err = tegra_bpmp_transfer_atomic(i2c->bpmp, &msg);
else else
err = tegra_bpmp_transfer(i2c->bpmp, &msg); err = tegra_bpmp_transfer(i2c->bpmp, &msg);
@@ -230,8 +231,9 @@ static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c,
return err; return err;
} }
static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter, static int tegra_bpmp_i2c_xfer_common(struct i2c_adapter *adapter,
struct i2c_msg *msgs, int num) struct i2c_msg *msgs, int num,
bool atomic)
{ {
struct tegra_bpmp_i2c *i2c = i2c_get_adapdata(adapter); struct tegra_bpmp_i2c *i2c = i2c_get_adapdata(adapter);
struct mrq_i2c_response response; struct mrq_i2c_response response;
@@ -253,7 +255,7 @@ static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,
return err; return err;
} }
err = tegra_bpmp_i2c_msg_xfer(i2c, &request, &response); err = tegra_bpmp_i2c_msg_xfer(i2c, &request, &response, atomic);
if (err < 0) { if (err < 0) {
dev_err(i2c->dev, "failed to transfer message: %d\n", err); dev_err(i2c->dev, "failed to transfer message: %d\n", err);
return err; return err;
@@ -268,6 +270,18 @@ static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,
return num; return num;
} }
static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,
struct i2c_msg *msgs, int num)
{
return tegra_bpmp_i2c_xfer_common(adapter, msgs, num, false);
}
static int tegra_bpmp_i2c_xfer_atomic(struct i2c_adapter *adapter,
struct i2c_msg *msgs, int num)
{
return tegra_bpmp_i2c_xfer_common(adapter, msgs, num, true);
}
static u32 tegra_bpmp_i2c_func(struct i2c_adapter *adapter) static u32 tegra_bpmp_i2c_func(struct i2c_adapter *adapter)
{ {
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR |
@@ -276,6 +290,7 @@ static u32 tegra_bpmp_i2c_func(struct i2c_adapter *adapter)
static const struct i2c_algorithm tegra_bpmp_i2c_algo = { static const struct i2c_algorithm tegra_bpmp_i2c_algo = {
.master_xfer = tegra_bpmp_i2c_xfer, .master_xfer = tegra_bpmp_i2c_xfer,
.master_xfer_atomic = tegra_bpmp_i2c_xfer_atomic,
.functionality = tegra_bpmp_i2c_func, .functionality = tegra_bpmp_i2c_func,
}; };