Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp117031yba; Wed, 3 Apr 2019 05:42:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqzvc1zvtMND6HqrhFjof2b5RoUBepqZwT/j/6Zw1zgZowJNrO2sMyomfdeJplMQceHBTCNt X-Received: by 2002:a17:902:15a8:: with SMTP id m37mr11760935pla.178.1554295355819; Wed, 03 Apr 2019 05:42:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1554295355; cv=none; d=google.com; s=arc-20160816; b=E4HY0vQ5wq6OyA7wxKg4kfFlBpMc/vIA50VXXFMROMokWZRuewm9BIcX1Pt2CByHi1 9GZHPhCYRJwyc5c2Ns8LvJ+vMoU+sdy0z28C5InNch6TESP9s1RZ5Mu1q13Fokj4HT3P rgVYRkFwklGBj9WPl0CpOSM8CtatlstYpNDuYIkyqOy0Lmwg/OTJFPO1gFafXDr/XwE4 wOP8LuxDDyfmsXGMxm309GjhR2eJDzt3dtFfZn8VwJ8A8eQnsmd8NGUvQnWutqck14PA YWw8bOD04dvPNAP47+nenZaQzMM2W31/rAWAUMfqXbT6ZJIGlZsX71CyeR+1vZwZ8Vvj sj6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=V6hHshx6W1pH6+DuR5fsykbMBJTmS0prvxlWnMX+SSw=; b=gI+1TnDOmM709wuIZrT2qfb/szAdbLHjOWaVP4/fJlEe2njoqN1OfOM5Sues9iDKbz v30WnfkiV579fYZYhUT4q/0kmviC9wDnlIj6/ti8yJ9TGUszohT5jBAvPR5VJVpy613S +ggxrlv+euBkPoyLL1J3uFOF6/yM8XsDI0syR8IXg/nmt6peEmB+kwyzybt5dBRBcVk0 QUuFGA3roQ7a56kepM/XgOZTdiitCp9t9aKLjpindxjLPIAaIjqsF0GyIsh+I0k54hD0 ebx/l1tgLGt8kojsiG7Y8z36cCvcft7cC23VAh8hAuWELS0nj88GOSkW14OPJ7BLFCEf GoYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 85si13236122pgb.183.2019.04.03.05.42.20; Wed, 03 Apr 2019 05:42:35 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726716AbfDCMkk (ORCPT + 99 others); Wed, 3 Apr 2019 08:40:40 -0400 Received: from sauhun.de ([88.99.104.3]:48350 "EHLO pokefinder.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726606AbfDCMkj (ORCPT ); Wed, 3 Apr 2019 08:40:39 -0400 Received: from localhost (p54B3311F.dip0.t-ipconnect.de [84.179.49.31]) by pokefinder.org (Postfix) with ESMTPSA id 385293E43CC; Wed, 3 Apr 2019 14:40:37 +0200 (CEST) From: Wolfram Sang To: linux-i2c@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Peter Rosin , Stefan Lengfeld , linux-omap@vger.kernel.org, linux-tegra@vger.kernel.org, Linus Walleij , Andy Shevchenko , Wolfram Sang Subject: [PATCH 05/12] i2c: demux: handle the new atomic callbacks Date: Wed, 3 Apr 2019 14:40:12 +0200 Message-Id: <20190403124019.8947-6-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190403124019.8947-1-wsa+renesas@sang-engineering.com> References: <20190403124019.8947-1-wsa+renesas@sang-engineering.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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