From patchwork Fri Jun 9 08:25:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raag Jadav X-Patchwork-Id: 105430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp801124vqr; Fri, 9 Jun 2023 01:46:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ74PK9OM/vSutMFdn8t0VPI0mWy+/0h122ZJLCpy5nlw8MrBreGx39uVTbYMsooDhFfX/pd X-Received: by 2002:a05:6870:b7a6:b0:192:a02e:7504 with SMTP id ed38-20020a056870b7a600b00192a02e7504mr599768oab.50.1686300376693; Fri, 09 Jun 2023 01:46:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686300376; cv=none; d=google.com; s=arc-20160816; b=xWdnQzMND5StOvWsleyKdlUrKtyU01T30Lm7wbAW2ek8iJuDXiKe3aSrZuv+oCp+aJ rzuMpbKL98DGNE25zFccWToO5LvAglsbk22NsGK70xOXHDaEVq/vZYtDI1/jDX0wz2bV unC+wpmvaDyKvzftvQfYzPbNPTrlKmgihFy4SDA6PPRuc9XOGsfxOeelJUNbfCyWxt9V RUavn9gSwmksVnNxoE2+wKn7oY8B26zu4PTD9HHzaP1UKRrHV5NyLR80mtPSa7jJmc1V M43ur2pNlgA7aRJnbcIJLxylZoKTlN7DxGH6LBHuKXXHmHtvWqbAPjVQS2hx7FOg/z3k lyPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=Eb+GtDQoTHeJcubcE5X9VsZkhvl0UvmnuLrLP8rT54U=; b=zevAIZH24WX4MhFLIe8tgQWLr7h7o1PW9Pb9QtEI6WaSsnSER6Yzp6Duer4YZsVePr e05GRO461FXwE19uVo1+LCbfbI+wLWisJ1eFdRs9upPyNtPAFKB7RpFfGictiMwKncC+ IWGMfYyCr6mJIKrhCWfvk64c4YoWU7cP/Dzk2uvfzp/I9XnMDw5l02emtYhj56cG2Qoq d/RApCXmQ2gfWGIpeR+KaFJMGBj6shucV3I39jx+RRiEwXtVo1e6lsmJ8dXbKExV6UUk Le3FenG/F2PnQ6ohhzpQJ0JqYQF+pdZoBkWWvhQ7i3SYowpgYyd8qkqCZxuWtLvlv8JL 7UTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=AzRoxGvA; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q15-20020a63750f000000b0053fb69a6397si2400312pgc.587.2023.06.09.01.46.02; Fri, 09 Jun 2023 01:46:16 -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; dkim=pass header.i=@intel.com header.s=Intel header.b=AzRoxGvA; 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=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241034AbjFII1j (ORCPT + 99 others); Fri, 9 Jun 2023 04:27:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241661AbjFII0S (ORCPT ); Fri, 9 Jun 2023 04:26:18 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B37C13AAC; Fri, 9 Jun 2023 01:26:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686299164; x=1717835164; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Jca4VwCHycfBasare1YXUgyB4DjUVfYUbAfgEFuOdug=; b=AzRoxGvAQWIIA9vj9fLauuCcevWPwNIyHCiFwkRfN3tJ9Zs3t7oGs4v/ UPtkstMVhDOvzrmQG7+ndb8Kpc5INN0Op3kjbohOjd371/C0yM4rp7MUr /k/s5wBQXm01/mVKyvcFQCwZC5SDKC/NEtkQ87d0JokXqAqcoXoOyHHpQ gLMnoPhnle1QiLP1QnkUyuz4aTdAGVGw3X+PRxPA3VlSkRBvZkvok9n2Y GPPy+HmMi6Z6gvH+yJmTgblW/LUnDCYIaBniYn4URVANtROM5TfGmX/5X 4o1CL7AJ5GXHJr2Ss5HOYcjU7ZZvWDZVTTf8GKdgg1aqnPyCxVaDm469H A==; X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="342222305" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208";a="342222305" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2023 01:26:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10735"; a="713424282" X-IronPort-AV: E=Sophos;i="6.00,228,1681196400"; d="scan'208";a="713424282" Received: from inesxmail01.iind.intel.com ([10.223.154.20]) by fmsmga007.fm.intel.com with ESMTP; 09 Jun 2023 01:25:59 -0700 Received: from inlubt0316.iind.intel.com (inlubt0316.iind.intel.com [10.191.20.213]) by inesxmail01.iind.intel.com (Postfix) with ESMTP id 0C0F119742; Fri, 9 Jun 2023 13:55:59 +0530 (IST) Received: by inlubt0316.iind.intel.com (Postfix, from userid 12101951) id 08E3F17C; Fri, 9 Jun 2023 13:55:59 +0530 (IST) From: Raag Jadav To: linus.walleij@linaro.org, mika.westerberg@linux.intel.com, andriy.shevchenko@linux.intel.com Cc: linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, mallikarjunappa.sangannavar@intel.com, pandith.n@intel.com, Raag Jadav Subject: [PATCH v2 4/4] pinctrl: intel: simplify exit path of gpio_request_enable hook Date: Fri, 9 Jun 2023 13:55:39 +0530 Message-Id: <20230609082539.24311-5-raag.jadav@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230609082539.24311-1-raag.jadav@intel.com> References: <20230609082539.24311-1-raag.jadav@intel.com> X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768214103734065768?= X-GMAIL-MSGID: =?utf-8?q?1768214103734065768?= Simplify exit path of ->gpio_request_enable() hook and save a few bytes. add/remove: 0/0 grow/shrink: 0/1 up/down: 0/-36 (-36) Function old new delta intel_gpio_request_enable 186 150 -36 Total: Before=10431, After=10395, chg -0.35% Signed-off-by: Raag Jadav --- drivers/pinctrl/intel/pinctrl-intel.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 2338e84615cc..12b994fa2aad 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c @@ -486,20 +486,19 @@ static int intel_gpio_request_enable(struct pinctrl_dev *pctldev, struct intel_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); void __iomem *padcfg0; unsigned long flags; + int ret = 0; padcfg0 = intel_get_padcfg(pctrl, pin, PADCFG0); raw_spin_lock_irqsave(&pctrl->lock, flags); if (!intel_pad_owned_by_host(pctrl, pin)) { - raw_spin_unlock_irqrestore(&pctrl->lock, flags); - return -EBUSY; + ret = -EBUSY; + goto out_unlock; } - if (!intel_pad_is_unlocked(pctrl, pin)) { - raw_spin_unlock_irqrestore(&pctrl->lock, flags); - return 0; - } + if (!intel_pad_is_unlocked(pctrl, pin)) + goto out_unlock; /* * If pin is already configured in GPIO mode, we assume that @@ -507,16 +506,15 @@ static int intel_gpio_request_enable(struct pinctrl_dev *pctldev, * potential glitches on the pin. Otherwise, for the pin in * alternative mode, consumer has to supply respective flags. */ - if (intel_gpio_get_gpio_mode(padcfg0) == PADCFG0_PMODE_GPIO) { - raw_spin_unlock_irqrestore(&pctrl->lock, flags); - return 0; - } + if (intel_gpio_get_gpio_mode(padcfg0) == PADCFG0_PMODE_GPIO) + goto out_unlock; intel_gpio_set_gpio_mode(padcfg0); +out_unlock: raw_spin_unlock_irqrestore(&pctrl->lock, flags); - return 0; + return ret; } static int intel_gpio_set_direction(struct pinctrl_dev *pctldev,