From patchwork Sat Sep 9 12:19:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Biju Das X-Patchwork-Id: 137845 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp1318317vqo; Sat, 9 Sep 2023 14:39:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEQRY+MfvEEKBVO2wtISKIixmIY4//f/V5bRxhlXLBP+9vOXl3OrI+MkfatvdGJIOQLqJQz X-Received: by 2002:a17:902:e74c:b0:1c3:a4f2:7ca3 with SMTP id p12-20020a170902e74c00b001c3a4f27ca3mr1425400plf.66.1694295582138; Sat, 09 Sep 2023 14:39:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694295582; cv=none; d=google.com; s=arc-20160816; b=wPldNOgGt1DnZpReAh1pntfsfaJ03BT7Al3yhzrNrhC5DFFXxw8LrO4gjzjJBLWKSC F5wLFM2c/y5FVXJX1vdZxr5m2HVtub3YWQJKoolWnmdiVJB0wbs8GP9rgmezF+crKZEE taM260oF9Z+wEj+gyA7usGfz0ldkkXivHwH8+Fsk6PjrPIai9L23ry10755BGA/hS1b2 nxPjSYJTbnTAUaCOMqmuT7hena9rZPjYU8YhpaYloB8AzDO2+IrTf7Ztzhy3HOe7+9J9 YFPoTmjfPAegBa1A9CaLc6ABQAAXpsdedV5ycB7W+qmv0yxSQP5GZAzkjjNnztqI/LzH 3WIQ== 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=x9yHI0WY4rBhD+w8gLYV6x+Yd1D2eM1RAUjsyg6Bxek=; fh=xeSrQ7kCdgcCVb2zAn5rBkDAdtmCo24cOODwKpU9NDo=; b=t9LPzx6RQNbMsBpzKPjkP+IgnHpimYTYZwrhSwLFnx+ZQ07byl0auFyl5Qq2eA5eOC 64/lIasoei9tuaFkqn5HQcqfoPFRZZ9gLjcPITP9rtfwbc4alIpAgDsbrWlUHj4muYLH C65EkhQyN3khuCXlsyILnJJcURagBhZzPmbbooxgTvDN6ROeqKfTO+O6Xn9Dei6cd6sp nzUjWWPswCP2q0Xa47ehKeaCJlYx0wRDxMTWLnCWazlUm8+pWo/VPgemI2kIE90Upu/e TqnMELKoSy5DZC0Oi66Gb5NISITYKMyuFOJnzfncltSQ8bCoBgLD0m+tQfqwdrnODU+f tPXw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c2-20020a170902d48200b001b69ede5b79si3713270plg.470.2023.09.09.14.39.39; Sat, 09 Sep 2023 14:39:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=renesas.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345753AbjIIMTZ (ORCPT + 11 others); Sat, 9 Sep 2023 08:19:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345668AbjIIMTW (ORCPT ); Sat, 9 Sep 2023 08:19:22 -0400 Received: from relmlie5.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id EFBA1CDE; Sat, 9 Sep 2023 05:19:17 -0700 (PDT) X-IronPort-AV: E=Sophos;i="6.02,239,1688396400"; d="scan'208";a="175527310" Received: from unknown (HELO relmlir6.idc.renesas.com) ([10.200.68.152]) by relmlie5.idc.renesas.com with ESMTP; 09 Sep 2023 21:19:17 +0900 Received: from localhost.localdomain (unknown [10.226.92.15]) by relmlir6.idc.renesas.com (Postfix) with ESMTP id BB96F41EBFFC; Sat, 9 Sep 2023 21:19:15 +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 v2 3/4] pinctrl: mcp23s08_spi: Simplify probe() Date: Sat, 9 Sep 2023 13:19:02 +0100 Message-Id: <20230909121903.34062-4-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230909121903.34062-1-biju.das.jz@bp.renesas.com> References: <20230909121903.34062-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-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776597684004688490 X-GMAIL-MSGID: 1776597684004688490 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 --- 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) {