From patchwork Thu Feb 22 00:05:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 876434 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-i2c-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="Icus5ipv"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zmvkT6yjrz9s0W for ; Thu, 22 Feb 2018 11:05:21 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346AbeBVAFU (ORCPT ); Wed, 21 Feb 2018 19:05:20 -0500 Received: from galahad.ideasonboard.com ([185.26.127.97]:54808 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751317AbeBVAFB (ORCPT ); Wed, 21 Feb 2018 19:05:01 -0500 Received: from avalon.bb.dnainternet.fi (dfj612ybrt5fhg77mgycy-3.rev.dnainternet.fi [IPv6:2001:14ba:21f5:5b00:2e86:4862:ef6a:2804]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id 8BC1420226; Thu, 22 Feb 2018 01:03:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1519257796; bh=/NTQjdqISGA3R/sc0Rpy0cfLWYfqhG7RzOTi38o2zxM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Icus5ipvbIeaSeuM1jWIV9eLdnCnjI8wx/gZFCMzpbblIQVjeJBTBAzKdDm91uSWg YTEihtg/U918f3SPxRm/aF7ZFkSUC1RWTCKxmsM/fyBfQfW8/ykGukg2dQusfZtdLN ilbftQBuEKy0PFW+YOGiYf8LSk60pjHdeS12ffzc= From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org, Pantelis Antoniou , Rob Herring , Frank Rowand , Matt Porter , Koen Kooi , Guenter Roeck , Marek Vasut , Wolfram Sang , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org Subject: [PATCH v5 6/8] i2c: demux: Use changeset helpers for clarity Date: Thu, 22 Feb 2018 02:05:29 +0200 Message-Id: <20180222000531.19448-7-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180222000531.19448-1-laurent.pinchart+renesas@ideasonboard.com> References: <20180222000531.19448-1-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Pantelis Antoniou The changeset helpers are easier to use, use them instead of using the static property. Signed-off-by: Pantelis Antoniou Acked-by: Wolfram Sang ["okay" -> "ok"] Signed-off-by: Laurent Pinchart --- drivers/i2c/muxes/i2c-demux-pinctrl.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/i2c/muxes/i2c-demux-pinctrl.c b/drivers/i2c/muxes/i2c-demux-pinctrl.c index 33ce032cb701..0f0046831492 100644 --- a/drivers/i2c/muxes/i2c-demux-pinctrl.c +++ b/drivers/i2c/muxes/i2c-demux-pinctrl.c @@ -220,10 +220,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) priv = devm_kzalloc(&pdev->dev, sizeof(*priv) + num_chan * sizeof(struct i2c_demux_pinctrl_chan), GFP_KERNEL); - - props = devm_kcalloc(&pdev->dev, num_chan, sizeof(*props), GFP_KERNEL); - - if (!priv || !props) + if (!priv) return -ENOMEM; err = of_property_read_string(np, "i2c-bus-name", &priv->bus_name); @@ -241,12 +238,9 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) } priv->chan[i].parent_np = adap_np; - props[i].name = devm_kstrdup(&pdev->dev, "status", GFP_KERNEL); - props[i].value = devm_kstrdup(&pdev->dev, "ok", GFP_KERNEL); - props[i].length = 3; - of_changeset_init(&priv->chan[i].chgset); - of_changeset_update_property(&priv->chan[i].chgset, adap_np, &props[i]); + of_changeset_update_property_string(&priv->chan[i].chgset, + adap_np, "status", "ok"); } priv->num_chan = num_chan;