| Message ID | 20190403124019.8947-6-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | i2c: core: introduce atomic transfers | expand |
On Wed, Apr 3, 2019 at 3:42 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > If the parent has an atomic callback, we need to translate it the same > way as the non-atomic callback. > Reviewed-by Andy Shevchenko <andriy.shevchenko@linux.intel.com> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > drivers/i2c/muxes/i2c-demux-pinctrl.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c > index 035032e20327..d50454c565ee 100644 > --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c > +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c > @@ -99,6 +99,8 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne > > /* Now fill out current adapter structure. cur_chan must be up to date */ > priv->algo.master_xfer = i2c_demux_master_xfer; > + if (adap->algo->master_xfer_atomic) > + priv->algo.master_xfer_atomic = i2c_demux_master_xfer; > priv->algo.functionality = i2c_demux_functionality; > > snprintf(priv->cur_adap.name, sizeof(priv->cur_adap.name), > -- > 2.11.0 >
diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c index 035032e20327..d50454c565ee 100644 --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c @@ -99,6 +99,8 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne /* Now fill out current adapter structure. cur_chan must be up to date */ priv->algo.master_xfer = i2c_demux_master_xfer; + if (adap->algo->master_xfer_atomic) + priv->algo.master_xfer_atomic = i2c_demux_master_xfer; priv->algo.functionality = i2c_demux_functionality; snprintf(priv->cur_adap.name, sizeof(priv->cur_adap.name),
If the parent has an atomic callback, we need to translate it the same way as the non-atomic callback. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/i2c/muxes/i2c-demux-pinctrl.c | 2 ++ 1 file changed, 2 insertions(+)