From patchwork Thu Mar 23 18:26:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 74165 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp3071211wrt; Thu, 23 Mar 2023 11:33:20 -0700 (PDT) X-Google-Smtp-Source: AKy350Zr0N5dnFnYavPFZBA1s/yeluKCYh220eXgbtGDyiO2g4/zYupWAc5pn5MTcAgteV4KehVI X-Received: by 2002:a17:907:c209:b0:8de:502e:2061 with SMTP id ti9-20020a170907c20900b008de502e2061mr94908ejc.3.1679596400603; Thu, 23 Mar 2023 11:33:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679596400; cv=none; d=google.com; s=arc-20160816; b=F7yP084yThZ/rzF/E7p8HB7uM7T3feqx4UYLPc2v+5E8zhsmtI36FRcHseRrOc2QH2 0HandEDAJVLsKX4obS/rBUxkVLHB8dgdNjr6w2sVTjMDYbydZ8SaMG8eAsIIJrq45QRf qNnN/SQzHlSXij8po82iMQZGAKyCVPQ4oXIfRVNRqVoztpjahVfBMi113AciVeFLYxVU mbGKHbttH6Pxn5AQh+nD4vysWVkyCN5THWEw7p5RIuo22jULIGCAHQ3LbF4l9EzdDV8C wyZiJtLrieCk/Yq71ynPEXmbubOG/DE9BjGsEQYB1Tu2rxhUKwr3wWAxxhRT0g1wnvfw 3zGQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=79ZZOAU72Jgc6yUF77wU4dwx4/S9w58xUG5BcKszjws=; b=O8dVq4SZ6jVJuzgNgaS3369ovfjJWbne7CZO9E44154hYXHGPAAUBgF9Y06kuQJnZu jGXfK7j0f9Yr+Lmxb4vA3tLRAC5w2tjQAkkLj/sjeY+toy2HcfQzVnKiWUylVxlKf/8H n/qIv5ASs49D6F94PgyMbv5kinKMM1offJHz8T+kqy+vxCqKVp070owHjAFuryjufC7x OMfC2/Ja8ccwD5W/lBhxmHEJLSLA79BXfw76U+OvpKxqoUY0Ls5hrhgJJiqc5oRAdzWV 8cnz5z64mookJLVeCLHHRP/Z2Ro44xS0p6Ac7Qk3IgL35zOvO3LRmoYCEPf20q6iz3AG D0JA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=is759ehm; 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 m13-20020a1709066d0d00b0090648134dc0si19160644ejr.394.2023.03.23.11.32.56; Thu, 23 Mar 2023 11:33:20 -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=is759ehm; 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 S229960AbjCWS0C (ORCPT + 99 others); Thu, 23 Mar 2023 14:26:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229752AbjCWS0A (ORCPT ); Thu, 23 Mar 2023 14:26:00 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C104B21A1E for ; Thu, 23 Mar 2023 11:25:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679595959; x=1711131959; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=PYlgK/auf6S13xZ9xgnXhcn/6W9A7pV84R6rW1hh8CE=; b=is759ehmJHDA/cG1Omp5PckXmYheoIRXJ36YI8+aBW10FL5uKpBh+ulM 7hAes6Nb53fEWkVeiP/wZlphOIRaYQTBrA07bhsk2oBVepyKAtgJyEW8I W3Cpb6N+f8eOgn0ieVSp4nHz4732LW7RPHAK9DF1Vpm/1oDF1CK1UUo0K AoQRS2HLRS6hwqJR3a4TH+edU63NIbfEK9BJvhsr6dBuyCUyjWDty33d1 gdp8N81FXa+QekoVUmjkqmiAiwquLnNrTUJqryuYt+2o93fazXX6hcFea NtgKP2iXg1eZzAXkl2xq4yzAcaXmiBE2Q8I9ZDhaFQvyFIqtMNTVaDEWY g==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="341139999" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="341139999" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 11:25:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="928345883" X-IronPort-AV: E=Sophos;i="5.98,285,1673942400"; d="scan'208";a="928345883" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 23 Mar 2023 11:25:57 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 1CDA9176; Thu, 23 Mar 2023 20:26:43 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Saravana Kannan , linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Andy Shevchenko Subject: [PATCH v1 1/1] driver core: Add a comment to set_primary_fwnode() on nullifying Date: Thu, 23 Mar 2023 20:26:40 +0200 Message-Id: <20230323182640.61085-1-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761184474951244723?= X-GMAIL-MSGID: =?utf-8?q?1761184474951244723?= Explain what parent && fn == parent->fwnode conditional does. With this refactor the code a bit. Signed-off-by: Andy Shevchenko --- drivers/base/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index f1889b9cab45..b59692a4d809 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -4982,9 +4982,13 @@ void set_primary_fwnode(struct device *dev, struct fwnode_handle *fwnode) } else { if (fwnode_is_primary(fn)) { dev->fwnode = fn->secondary; + + /* Skip nullifying fn->secondary if the primary is shared */ + if (parent && fn == parent->fwnode) + return; + /* Set fn->secondary = NULL, so fn remains the primary fwnode */ - if (!(parent && fn == parent->fwnode)) - fn->secondary = NULL; + fn->secondary = NULL; } else { dev->fwnode = NULL; }