From patchwork Sun Sep 24 17:23:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 144128 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp764949vqu; Sun, 24 Sep 2023 10:23:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFdOHo+Fo7BPMcixkYcmu25TpL4EPz+yLmskib0TuOIWFucdx7YrByroi7sp9A4z4hjMQaR X-Received: by 2002:a05:6a20:1398:b0:15d:684d:f518 with SMTP id hn24-20020a056a20139800b0015d684df518mr5265728pzc.26.1695576222936; Sun, 24 Sep 2023 10:23:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695576222; cv=none; d=google.com; s=arc-20160816; b=QlbCvh2vjmTjRFWXTGQHdX0YXTHVQrBCZ1utV0Yfus3Jofkc2StHJVavUq1ZI3UFci h+0x6f3B1AwiFaiD+yGJwj8ZKyO9GqsllXTQfd30RhYSIEmGCVzHn28lzcMVDUJB7xXj /fyQOPIFOB8XOe++11RM29wTt0TQnt/XZXKeodOf0atU2ibCXTDxPDIT8/kEATROjwwl T5Hu0gBfrsBt6GpUJ+zLYiCEW1yPwLfo7qGlUaCMrivjiVYzPfjn2wSJhdj1+UTCqjDB 3I8cvKHWF3tMWp4FAhVX+e/oI9VQfJxZXqyVI5gC1v4rOugD7n2+0PYrrlpOr8juAVaZ 9qvQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=pFaPcoCwGvc5foQUGxoKi+eY9Y9ErDQBCfWOIe+dG1Y=; fh=xeSrQ7kCdgcCVb2zAn5rBkDAdtmCo24cOODwKpU9NDo=; b=CQiJluTKMtHWRlaH+9iFCgQCFDPlLbZhcEATVgG62sM/awqCSr0QibEzzkD6OAZlat a/KHt5CexrJo0ORBH2rMxxW4bUJAY8JqWzFwUx3mRfZ3JfdQrOGHt1b5CdQ4RdqAWvVw I001EYV4/+47XQZFSiqZAwAKTzN2cmPn7XFCSNwPbrjMPZ7ipWa/Rm5xONfWDXIc3C2y wrzIs8CPALYyGCbmbJ9yKUaMIkC1JcjFcn2pzekciDhHiLoUXXBr80gigkF0vKAyaoGU 8cVUfpCIL88L2OBS0YtRQLNuT6VrE5MeLgIEEyTcLax0XEilu+YvdCHzeIhfLfW9Z1yv R3/g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id cf4-20020a056a02084400b00577ed0133d2si8042750pgb.453.2023.09.24.10.23.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Sep 2023 10:23:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 3FCC6802FA6D; Sun, 24 Sep 2023 10:23:42 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230300AbjIXRXo (ORCPT + 30 others); Sun, 24 Sep 2023 13:23:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230237AbjIXRXl (ORCPT ); Sun, 24 Sep 2023 13:23:41 -0400 Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5885D103; Sun, 24 Sep 2023 10:23:32 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.03,173,1694703600"; d="scan'208";a="180780922" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie6.idc.renesas.com with ESMTP; 25 Sep 2023 02:23:32 +0900 Received: from localhost.localdomain (unknown [10.226.92.4]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id D111E402D0AD; Mon, 25 Sep 2023 02:23:29 +0900 (JST) From: Biju Das To: Linus Walleij Cc: Biju Das , linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, Biju Das , Andy Shevchenko Subject: [PATCH v3 2/3] pinctrl: mcp23s08_spi: Simplify probe() Date: Sun, 24 Sep 2023 18:23:19 +0100 Message-Id: <20230924172320.15165-3-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230924172320.15165-1-biju.das.jz@bp.renesas.com> References: <20230924172320.15165-1-biju.das.jz@bp.renesas.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 24 Sep 2023 10:23:42 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777940533327833693 X-GMAIL-MSGID: 1777940533327833693 Simpilfy probe() by replacing device_get_match_data() and ID lookup for retrieving match data by spi_get_device_match_data(). While at it, replace data type of variable type from 'int'->'unsigned int' and declare variables following a reverse christmas tree order. Signed-off-by: Biju Das Reviewed-by: Andy Shevchenko --- v2->v3: * Added Rb tag from Andy * Reordered the patch. v2: * New patch. --- drivers/pinctrl/pinctrl-mcp23s08_spi.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/pinctrl/pinctrl-mcp23s08_spi.c b/drivers/pinctrl/pinctrl-mcp23s08_spi.c index ea059b9c5542..caf528284d07 100644 --- a/drivers/pinctrl/pinctrl-mcp23s08_spi.c +++ b/drivers/pinctrl/pinctrl-mcp23s08_spi.c @@ -143,22 +143,17 @@ static int mcp23s08_spi_regmap_init(struct mcp23s08 *mcp, struct device *dev, static int mcp23s08_probe(struct spi_device *spi) { - struct device *dev = &spi->dev; struct mcp23s08_driver_data *data; + struct device *dev = &spi->dev; unsigned long spi_present_mask; - const void *match; - unsigned int addr; unsigned int ngpio = 0; + unsigned int type; + unsigned int addr; int chips; - int type; int ret; u32 v; - match = device_get_match_data(dev); - if (match) - type = (int)(uintptr_t)match; - else - type = spi_get_device_id(spi)->driver_data; + type = (uintptr_t)spi_get_device_match_data(spi); ret = device_property_read_u32(dev, "microchip,spi-present-mask", &v); if (ret) {