On Sat, Mar 02, 2019 at 02:47:34PM +0100, Wolfram Sang wrote:
> The driver did handle this internally, convert it to use the new
> callbacks.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@xxxxxxxxxxxxxxxxxxxx>
Reviewed-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
> ---
> drivers/i2c/busses/i2c-tegra-bpmp.c | 27 ++++++++++++++++++++++-----
> 1 file changed, 22 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-tegra-bpmp.c b/drivers/i2c/busses/i2c-tegra-bpmp.c
> index f6cd35d0a2ac..02b78ba5b23b 100644
> --- a/drivers/i2c/busses/i2c-tegra-bpmp.c
> +++ b/drivers/i2c/busses/i2c-tegra-bpmp.c
> @@ -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,
> struct mrq_i2c_request *request,
> - struct mrq_i2c_response *response)
> + struct mrq_i2c_response *response,
> + bool atomic)
> {
> struct tegra_bpmp_message msg;
> int err;
> @@ -222,7 +223,7 @@ static int tegra_bpmp_i2c_msg_xfer(struct tegra_bpmp_i2c *i2c,
> msg.rx.data = response;
> msg.rx.size = sizeof(*response);
>
> - if (irqs_disabled())
> + if (atomic)
> err = tegra_bpmp_transfer_atomic(i2c->bpmp, &msg);
> else
> 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;
> }
>
> -static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,
> - struct i2c_msg *msgs, int num)
> +static int tegra_bpmp_i2c_xfer_common(struct i2c_adapter *adapter,
> + struct i2c_msg *msgs, int num,
> + bool atomic)
> {
> struct tegra_bpmp_i2c *i2c = i2c_get_adapdata(adapter);
> struct mrq_i2c_response response;
> @@ -253,7 +255,7 @@ static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,
> return err;
> }
>
> - err = tegra_bpmp_i2c_msg_xfer(i2c, &request, &response);
> + err = tegra_bpmp_i2c_msg_xfer(i2c, &request, &response, atomic);
> if (err < 0) {
> dev_err(i2c->dev, "failed to transfer message: %d\n", err);
> return err;
> @@ -268,6 +270,20 @@ static int tegra_bpmp_i2c_xfer(struct i2c_adapter *adapter,
> 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)
> {
> return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_10BIT_ADDR |
> @@ -276,6 +292,7 @@ static u32 tegra_bpmp_i2c_func(struct i2c_adapter *adapter)
>
> static const struct i2c_algorithm tegra_bpmp_i2c_algo = {
> .master_xfer = tegra_bpmp_i2c_xfer,
> + .master_xfer_atomic = tegra_bpmp_i2c_xfer_atomic,
> .functionality = tegra_bpmp_i2c_func,
> };
>
> --
> 2.11.0
>
