From patchwork Mon Jul 3 14:23:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115392 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp568814vqx; Mon, 3 Jul 2023 07:34:30 -0700 (PDT) X-Google-Smtp-Source: APBJJlH/yYEi73eN0clTjlEGYR05kfEFX4baZzx+DhM8qvme/hIYuDSdIsj9+xEk9osD6722+7pG X-Received: by 2002:a05:6a00:1d05:b0:67f:8ef5:2643 with SMTP id a5-20020a056a001d0500b0067f8ef52643mr11891689pfx.2.1688394870293; Mon, 03 Jul 2023 07:34:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688394870; cv=none; d=google.com; s=arc-20160816; b=wBhOjDfFlALH4mgNHrsKd9tmHKiVo4WnWMJ4+MBZR68nK/ZRcsobmf3//oTQdcMIjt vV+fkR5eyQsAcIbl+wmYAGIOEN/tR3iZCiwYKnA2kJ3nIzTRVVrUQVsgnyeMNnXHKyHQ j8lDyk/zN+a2BcJ/shAuy2ItF7ZoWHha/SAIYZe/SFsRjkPdYUfXXtM34jS2M3YWQQCY 0AK/AdyRRmp8ZDcmd/74RGeWb5egTkCaUc6tZSPaxmC2hMAcN6KZmfsIPPskmMozDz8j NG8g/7Bkr3WFEyqM7AAC2/soEPvaP4wuQOMcObxeU/HJAUE50dyAg/r4TdpIGH91Dvfu +Piw== 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 :dkim-signature; bh=azuMm318n9QcfqOw7noaqStqC/MNHjN/jE7uHgHo914=; fh=mypHXuxD8gSLe08qvqUlK15JxsKF/fcoUw3RZMSAp6o=; b=uXixM5u+bZsDg61gm5ovnbF5b4r0qwv7pWPaCq96OnyJ6opq90xicygYc/rBbEcch3 0KiFvb3si8IM8rfMBbW5Q5+wEeqPQ6vdGuI0mpF39Qe3lIiXCXoWcmQSyyZAA+uMI+RF aq1ZRktqenzoEwHsW/5Bfs7uabKwI7QPn44g7OOKX8E3qpB6UiMYsTkNlh1WNU2TF3VQ kqsYlcj/kfb+ofsxti61mQWnxJZJrT9aDE+XomzYsg0N29Un5IQovhzadeL1IFUoGZjw 7McU3YyEHekviOwQ1rzjiPmwEQI2Qvy1Trm4p95JBeHu4kQkhSEm8bXR1wNXc88K9pIe M/+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=E5FG1hNZ; 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 fc9-20020a056a002e0900b0066a1f3a9190si18806078pfb.207.2023.07.03.07.34.11; Mon, 03 Jul 2023 07:34:30 -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=E5FG1hNZ; 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 S231159AbjGCOXV (ORCPT + 99 others); Mon, 3 Jul 2023 10:23:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48176 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230313AbjGCOXM (ORCPT ); Mon, 3 Jul 2023 10:23:12 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 668A0E5B; Mon, 3 Jul 2023 07:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688394191; x=1719930191; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=tQChtNbKGESPPW51x4K39nGYYp9RM7si+0oe9MCGHJo=; b=E5FG1hNZ8kb9XJgqT6f4mVncKazYb4mk26aA62zlsnViptpCUi+gtkzM sAf5RFQjwRTMxDSX9kupfBrLvXMRIGIR3rWxgrnYebC42+qvJYiQdYkBo vWoLu1tJPQaEt4JWnNKiY2nB5wSUZ7Mi5QnFPZSgCZg+kfVZGqfiBH05n uXqDKyOggx/2u4inFf52yXr2Ms3aX1Y1O7UL39qEwslx61Ik15nWDUQ0z 2ozX4c0anFFdhhW0JkxPh4O3V8maMQ5OSs+kvRZf2HWLtfkAW7uAQ11SK Y4meI0S57cdBaIA/mxAXhNHBsNUl09KC4TxCBdgD2AQS0XKsA41tSWAvJ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="361752571" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="361752571" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 07:23:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="808602022" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="808602022" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 03 Jul 2023 07:23:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id BFBB613C; Mon, 3 Jul 2023 17:23:09 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Dmitry Torokhov , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Linus Walleij , Bartosz Golaszewski , Benjamin Tissoires Subject: [PATCH v2 1/3] gpiolib: of: Don't use GPIO chip fwnode in of_gpiochip_*() Date: Mon, 3 Jul 2023 17:23:06 +0300 Message-Id: <20230703142308.5772-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703142308.5772-1-andriy.shevchenko@linux.intel.com> References: <20230703142308.5772-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770410339672304883?= X-GMAIL-MSGID: =?utf-8?q?1770410339672304883?= GPIO library should rely only on the GPIO device's fwnode. Hence, replace GPIO chip fwnode usage by respective OF node of the GPIO device. JFYI, this is partial revert of 8afe82550240 ("gpiolib: of: Prepare of_gpiochip_add() / of_gpiochip_remove() for fwnode"). Signed-off-by: Andy Shevchenko Tested-by: Benjamin Tissoires --- drivers/gpio/gpiolib-of.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 1436cdb5fa26..5fde5a3f5118 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c @@ -1078,16 +1078,16 @@ int of_gpiochip_add(struct gpio_chip *chip) if (ret) return ret; - fwnode_handle_get(chip->fwnode); + of_node_get(np); ret = of_gpiochip_scan_gpios(chip); if (ret) - fwnode_handle_put(chip->fwnode); + of_node_put(np); return ret; } void of_gpiochip_remove(struct gpio_chip *chip) { - fwnode_handle_put(chip->fwnode); + of_node_put(dev_of_node(&chip->gpiodev->dev)); } From patchwork Mon Jul 3 14:23:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115397 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp574283vqx; Mon, 3 Jul 2023 07:43:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5eYFRwjzJqt1HdhHKh/y16EQ1dp997WXIkRB8tGkyTji/bWuBCdidemzZwDE+Pq4xZzcZb X-Received: by 2002:a05:6870:b628:b0:19f:21c3:9771 with SMTP id cm40-20020a056870b62800b0019f21c39771mr8181457oab.3.1688395420892; Mon, 03 Jul 2023 07:43:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688395420; cv=none; d=google.com; s=arc-20160816; b=cjc42ahYsWxAYrIsfutjUJSgVdhre14jBM6za4AK8+Mlj1K+7m20VvKBOzUjUwqpKw BiACsfrpZYgV0sNxmOKUbrac8BfXe26UFSnT7Ku9ObtRWZ3B/ovhWzS7hyD1tG8ar+8S dkVRQvMsG7JleiwzcyTwAa1GuSn8lClPWmwsHOQdDRiISd+fsBWlhMv8ZQpjC94+YB8g ar5BOCaz8ZGSJgvauf3ESfejtSd046cgTCz/3Msk9jhMQeNk8CmXK2sBXJa8vFGiazqc PDK5ZDNeRA6G/ck1Te0/wX9Zj9NmZ9y+N0Rq9EE+NEXJUL8KKCDAwwcWdbjfXFjKSgPe gcBA== 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 :dkim-signature; bh=gu1cWou4Pcv00MrhMC7iqdYBWZujl4iWBKyrh+O+U9A=; fh=mypHXuxD8gSLe08qvqUlK15JxsKF/fcoUw3RZMSAp6o=; b=q9KYq5U6kYFhAgNIRBOl6j/DjLaLdaAQ+6t0hGJRormljog8FGm++iqIzRXIgmQYUQ A08BbXjVvEWbTfGdVl7Fr6eK0fTaKDbB1xT0KlWOkJ/YjSwc7rQIm0Cd7aBcxGem9+lI ffSCAjVTxB0U1Dy0JKd0WLsrUbMhsWvQPMMjwMhMTElcs30KJKQk0Xhr2IOi2EpbRyp8 RT2wD8oy/8LF3z43oOPrfzg7TOh49a6SwMvZvcZgoqeYv32tQH5EYjncra/w3DyBSZf3 S2yazbwr9paFfqUz27k7YyRY55uFz2H40TEk6oBi6BY3QaPNUYtvj4JZV1XwVugxqvvH vOtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=UAw3yuAd; 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 bf16-20020a17090b0b1000b002637aa0a4dbsi7211977pjb.103.2023.07.03.07.43.26; Mon, 03 Jul 2023 07:43:40 -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=UAw3yuAd; 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 S231145AbjGCOXS (ORCPT + 99 others); Mon, 3 Jul 2023 10:23:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48178 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230258AbjGCOXM (ORCPT ); Mon, 3 Jul 2023 10:23:12 -0400 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6779EE5C; Mon, 3 Jul 2023 07:23:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688394191; x=1719930191; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DNmqWKEUkkpN5FpohkxiaOCL3JlrnO8cxsg2K7hyZ1U=; b=UAw3yuAdSrsx+cmvhnd2skVGDP8IHq1rDSsV1POL75Xf4Sq2ZKFF12U/ tLxuLWDan/WOGbmODDHYC1ra9c+fqkP2aK2Dh6GwXrsmp6C1NqeMNPui+ G7fQ973wUBkNftIp6TmxsIWt1GUSbV6gYanUyV5RrudewNocFnBLnamw5 s4vkOSvXN5FN6iu5Fst1jdD7BVxnW8X6PnJN68qPx+CUp72FuhfQbboPV GEDoi/86zmwQUUuCUSlFJjaHQNVCesJrJ3pxUdSRmC6gmYaKmLQXFBc0f OmFonCXY/glOJdzcgET5L4FnshuSAMfmLQj0uF8rlzUJrwUkJ20SMGOZN Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="347681270" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="347681270" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 07:23:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="783917061" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="783917061" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 03 Jul 2023 07:23:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id C9B44177; Mon, 3 Jul 2023 17:23:09 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Dmitry Torokhov , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Linus Walleij , Bartosz Golaszewski , Benjamin Tissoires Subject: [PATCH v2 2/3] gpiolib: acpi: Don't use GPIO chip fwnode in acpi_gpiochip_find() Date: Mon, 3 Jul 2023 17:23:07 +0300 Message-Id: <20230703142308.5772-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703142308.5772-1-andriy.shevchenko@linux.intel.com> References: <20230703142308.5772-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE 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?1770410916843336042?= X-GMAIL-MSGID: =?utf-8?q?1770410916843336042?= GPIO library should rely only on the GPIO device's fwnode. Hence, replace GPIO chip fwnode usage by respective handle of the GPIO device. Signed-off-by: Andy Shevchenko Tested-by: Benjamin Tissoires --- drivers/gpio/gpiolib-acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index 97496c0f9133..fbda452fb4d6 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -128,7 +128,7 @@ static bool acpi_gpio_deferred_req_irqs_done; static int acpi_gpiochip_find(struct gpio_chip *gc, void *data) { - return ACPI_HANDLE_FWNODE(gc->fwnode) == data; + return device_match_acpi_handle(&gc->gpiodev->dev, data); } /** From patchwork Mon Jul 3 14:23:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 115398 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp574287vqx; Mon, 3 Jul 2023 07:43:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlFH20w1X+aOqbIAMfdgVSjsNeJaFX9NoDKS9fuvGI2g6GkLjaYg7zRP76jImnjFvLYLTXpb X-Received: by 2002:a05:6a00:1249:b0:66f:3fc5:6167 with SMTP id u9-20020a056a00124900b0066f3fc56167mr13154491pfi.1.1688395421056; Mon, 03 Jul 2023 07:43:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688395421; cv=none; d=google.com; s=arc-20160816; b=sI+5ynwV8ix1dajEK6hKSXA87j2ewMVozh7DpCNQQiWG3rEOPybb2f+SWfDT0fUjzt 6vtsLMnbRaxwZQMWHYbld9tQmcwnOBE/p3c9C1S8DiH5fBc7Pw1hsvNv+2BE2r6XdmKY gvi+wGki5ebCg89hwVg2zpjAYYrMp8n7tHQ/o1YViRJDlhT9I6f6sItHEy3L3LqPLavs 5T1laDYmUuhwJgWOP4g0QmG1AuF1854QOf4WTt/yRsx1RkNQRP0/GAgSXgFBkSURnQ09 mVJC/eSo4oGl4lJAPtyh8k7Ax/R8rdK/bQ9v8C81E22YYSRpGZ1Agn3O4+tb6cZAO3D+ J9HA== 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 :dkim-signature; bh=UOrDe1Z2Op68lWjZ/ynR5Bdm2LgpRHbB+utSMIrng4Q=; fh=mypHXuxD8gSLe08qvqUlK15JxsKF/fcoUw3RZMSAp6o=; b=m+ZUvHRId1l1CY/cY23r5Iml/odsoyxePvolLwPz9hcWGeRA+9z/Nb+X/kCLMJPx+t 3W064KQ6UHKwYRF3ItnR/BK8238xBysOEtFe/aSqYDLISJ6X85pk6zn91JbOP6anZiih ICyT+EW9WfiFuaWZlSogoXCzewzhuUU5CSMaq7ulNbufyBZm3bwDZJGvHvn2LNr5H7Da LMgxyZl4M6fG8M6eKuqYnMNbk94H/Eb3vK7eu1KR0u6HortWWsWD+yEt/Gq3GlqjqjNh +qK9wNhaJh9iIsN5toc9vLjb1QiKSnKovKrfAU2P95Opp9JND2rL1MBaDG8TjkhHySE8 LcGA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="YppO9w/q"; 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 bt20-20020a056a00439400b0068208d19b1dsi9405757pfb.153.2023.07.03.07.43.27; Mon, 03 Jul 2023 07:43:41 -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="YppO9w/q"; 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 S230392AbjGCOXN (ORCPT + 99 others); Mon, 3 Jul 2023 10:23:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbjGCOXL (ORCPT ); Mon, 3 Jul 2023 10:23:11 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE965E59; Mon, 3 Jul 2023 07:23:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1688394189; x=1719930189; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=NHA/m/W7ECo+9Ht24ncNolRYwqlkEkvfdTVYskUAM7Y=; b=YppO9w/qLlV9jrS5F+oTQZYxmirOhOSpvWJL7PqsaT3m8A4ugxtxjENX n80ON5LBpCJWqjwtrkyV7gKQITD+Mt6QqkP2S6hxBtv/d90+bRHhDG9xM Z/KkWqmrh3Em7oL6qzT9wiLKf+VabapkeEV2b79+wzWMRvKlWTPGimcro 6iDPII1r6cYc68njypUdUybv1cC9LLIeRsBlep0hjsbiiq8fCbubDVZZY 4Q4zC31ddYN5gK2FyiOqDnAqT8ujJWMABNycc+9tHIifRLTA0BSMAg7tb BzR3zBpTPUjG/4HABXeAPc1uxC7qZrutcluZ8lNw/vZIv52z7ieteMxeL Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="361752563" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="361752563" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Jul 2023 07:23:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10760"; a="808602021" X-IronPort-AV: E=Sophos;i="6.01,178,1684825200"; d="scan'208";a="808602021" Received: from black.fi.intel.com ([10.237.72.28]) by FMSMGA003.fm.intel.com with ESMTP; 03 Jul 2023 07:23:06 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id D964917C; Mon, 3 Jul 2023 17:23:09 +0300 (EEST) From: Andy Shevchenko To: Andy Shevchenko , Dmitry Torokhov , Bartosz Golaszewski , linux-gpio@vger.kernel.org, linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Mika Westerberg , Linus Walleij , Bartosz Golaszewski , Benjamin Tissoires Subject: [PATCH v2 3/3] gpiolib: Do not alter GPIO chip fwnode member Date: Mon, 3 Jul 2023 17:23:08 +0300 Message-Id: <20230703142308.5772-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230703142308.5772-1-andriy.shevchenko@linux.intel.com> References: <20230703142308.5772-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE 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?1770410917003419951?= X-GMAIL-MSGID: =?utf-8?q?1770410917003419951?= Ideally we should not touch data in the given GPIO chip structure. Let's become closer to it by avoiding altering fwnode member. The GPIO library must use fwnode from GPIO device and the drivers might use one from GPIO chip in case they initialized it. Signed-off-by: Andy Shevchenko Tested-by: Benjamin Tissoires --- drivers/gpio/gpiolib.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index bc8b9d6afe0e..8b7032300039 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c @@ -708,13 +708,6 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, int base = 0; int ret = 0; - /* - * If the calling driver did not initialize firmware node, do it here - * using the parent device, if any. - */ - if (!gc->fwnode && gc->parent) - gc->fwnode = dev_fwnode(gc->parent); - /* * First: allocate and populate the internal stat container, and * set up the struct device. @@ -729,7 +722,14 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, gc->gpiodev = gdev; gpiochip_set_data(gc, data); - device_set_node(&gdev->dev, gc->fwnode); + /* + * If the calling driver did not initialize firmware node, + * do it here using the parent device, if any. + */ + if (gc->fwnode) + device_set_node(&gdev->dev, gc->fwnode); + else if (gc->parent) + device_set_node(&gdev->dev, dev_fwnode(gc->parent)); gdev->id = ida_alloc(&gpio_ida, GFP_KERNEL); if (gdev->id < 0) {