From patchwork Wed Dec 28 09:49:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 37159 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp1807406wrt; Wed, 28 Dec 2022 01:52:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXt5AwD5T6JruiI8QB8k3RbGtQ4EF295cToGflnSQZ5gPB4KAWu8rVIwgi7cpU0iJZAXXhCR X-Received: by 2002:a05:6a20:ce07:b0:af:ee05:fd0b with SMTP id ic7-20020a056a20ce0700b000afee05fd0bmr23903916pzb.3.1672221129409; Wed, 28 Dec 2022 01:52:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672221129; cv=none; d=google.com; s=arc-20160816; b=qDL6X7Fzz+DfnkS0PyjM0vUvleqoO6aC9VnqazlBIY55d2Q8YP/WPQjkK7Zihfi1F9 Iuwmd2fRL9D92qnSZeNBhn8QXfyk0Dhpaub0VHVYFm1na32V7hQGDeBfC+y0paY/p+V+ qyxdOgfvsJCno+M7bZniscFQOq+M6b6CRpXpkZt1Jpv7UIQLVsw/mqDtSqY+e0ZeTFQx R5Cz2u6J1e0oAXFcSRsuh9lfWpS9kuQN3WDGqKKvJl0ZydgWIg9Atbhf204dTUnGxYNM Hm6NsPhZHZ9R03yeJrz3MPNndj9WKf1T6YkSxFvMb1ZFNAvgbEjZWB1C2Z8zCRe50Imk rtlw== 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=4E8BPWOId2SD8GkIgDlUfTHiLNZLNtOot3ZaJjg1SMY=; b=BFEJ0rW1KAmSL6AYsbByyxqcZ0idThoajZ/QinmGeIJ2Wzzv/plZr8tc0Jm4gdwv9f E0I5bRd1aXPKedq4k+vQ1mj+1yDF96oXDkAI+cigcE5LHGVmqzgt7OJqrqDWiiCkH99V ThqDuN1Om/MZYRWR3HXYvuTSiYj+jyaU+onPTqWdLpJLv+iBKouf5THUPPKhLUjjUZMw 3+KUmCiamZJNjP1jXmw90P35Eb3xFcA8lR73BkPCqI18b/JMawG0B+Z/j78P2iqVpSZr zjm5why7jcM9gzth56ZXl22bIj019YJJhG3cRIP5JiGlAkgaxdy3VoZqB7/Xduk95TSg C9oQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=hRVFbcsB; 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 x24-20020a63db58000000b004982aa44074si8610095pgi.561.2022.12.28.01.51.57; Wed, 28 Dec 2022 01:52:09 -0800 (PST) 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=hRVFbcsB; 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 S232888AbiL1Jt2 (ORCPT + 99 others); Wed, 28 Dec 2022 04:49:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232743AbiL1JtH (ORCPT ); Wed, 28 Dec 2022 04:49:07 -0500 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 646BEB49D; Wed, 28 Dec 2022 01:49:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1672220946; x=1703756946; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0u5IsrNBQxzPiuX3yAvZkXxVrfEb80cScOuP7bq7Jv8=; b=hRVFbcsB2qRfxDRFw9L0liQdEBCbQy0up8tveKU25gTWkbUictNCgtWI I2iCbYbDjBQ2nYeT4RmcjLUOhtBk+WIVTby+XYBC43maVctzJ3lv2YQdK XZa0aPbribIlQ3+xeaerlZYvgvtaU1RR1xOYKz4dzy34ErDF3zG++uj3g 2EWmp0B2Uw3FUfD797+jCro1j38zT84OYxInWy8IKHK3OndJ3wNdWYRTk 1IcPUooORcL4bTTMg9M0mz1glwOfrJlg4kcnxbqB+hHryh6q/Xo1JDcrm KaUjyTiG7EZLqFuKgfKCKMz2alrneJDFFziKisja327qioaM7beuSjPPm w==; X-IronPort-AV: E=McAfee;i="6500,9779,10573"; a="385266802" X-IronPort-AV: E=Sophos;i="5.96,280,1665471600"; d="scan'208";a="385266802" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Dec 2022 01:49:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10573"; a="603291138" X-IronPort-AV: E=Sophos;i="5.96,280,1665471600"; d="scan'208";a="603291138" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga003.jf.intel.com with ESMTP; 28 Dec 2022 01:48:59 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 7C0911CA; Wed, 28 Dec 2022 11:49:30 +0200 (EET) From: Andy Shevchenko To: Greg Kroah-Hartman , Sakari Ailus , Heikki Krogerus , Andy Shevchenko , Daniel Scally , linux-acpi@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org Cc: "Rafael J. Wysocki" , Yong Zhi , Bingbu Cao , Tianshu Qiu , Mauro Carvalho Chehab , Daniel Scally Subject: [PATCH v3 3/4] software node: Switch property entry test to a new API Date: Wed, 28 Dec 2022 11:49:21 +0200 Message-Id: <20221228094922.84119-4-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221228094922.84119-1-andriy.shevchenko@linux.intel.com> References: <20221228094922.84119-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 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?1753450943145762047?= X-GMAIL-MSGID: =?utf-8?q?1753450943145762047?= Switch property entry test to use software_node_register_node_group() API. The current one is going to be removed soon. Signed-off-by: Andy Shevchenko Acked-by: Greg Kroah-Hartman Acked-by: Sakari Ailus Tested-by: Daniel Scally Acked-by: Heikki Krogerus --- drivers/base/test/property-entry-test.c | 30 ++++++++++++------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/drivers/base/test/property-entry-test.c b/drivers/base/test/property-entry-test.c index 6071d5bc128c..dd2b606d76a3 100644 --- a/drivers/base/test/property-entry-test.c +++ b/drivers/base/test/property-entry-test.c @@ -405,20 +405,18 @@ static void pe_test_move_inline_str(struct kunit *test) /* Handling of reference properties */ static void pe_test_reference(struct kunit *test) { - static const struct software_node nodes[] = { - { .name = "1", }, - { .name = "2", }, - { } - }; + static const struct software_node node1 = { .name = "1" }; + static const struct software_node node2 = { .name = "2" }; + static const struct software_node *group[] = { &node1, &node2, NULL }; static const struct software_node_ref_args refs[] = { - SOFTWARE_NODE_REFERENCE(&nodes[0]), - SOFTWARE_NODE_REFERENCE(&nodes[1], 3, 4), + SOFTWARE_NODE_REFERENCE(&node1), + SOFTWARE_NODE_REFERENCE(&node2, 3, 4), }; const struct property_entry entries[] = { - PROPERTY_ENTRY_REF("ref-1", &nodes[0]), - PROPERTY_ENTRY_REF("ref-2", &nodes[1], 1, 2), + PROPERTY_ENTRY_REF("ref-1", &node1), + PROPERTY_ENTRY_REF("ref-2", &node2, 1, 2), PROPERTY_ENTRY_REF_ARRAY("ref-3", refs), { } }; @@ -427,7 +425,7 @@ static void pe_test_reference(struct kunit *test) struct fwnode_reference_args ref; int error; - error = software_node_register_nodes(nodes); + error = software_node_register_node_group(group); KUNIT_ASSERT_EQ(test, error, 0); node = fwnode_create_software_node(entries, NULL); @@ -436,7 +434,7 @@ static void pe_test_reference(struct kunit *test) error = fwnode_property_get_reference_args(node, "ref-1", NULL, 0, 0, &ref); KUNIT_ASSERT_EQ(test, error, 0); - KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &nodes[0]); + KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &node1); KUNIT_EXPECT_EQ(test, ref.nargs, 0U); /* wrong index */ @@ -447,7 +445,7 @@ static void pe_test_reference(struct kunit *test) error = fwnode_property_get_reference_args(node, "ref-2", NULL, 1, 0, &ref); KUNIT_ASSERT_EQ(test, error, 0); - KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &nodes[1]); + KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &node2); KUNIT_EXPECT_EQ(test, ref.nargs, 1U); KUNIT_EXPECT_EQ(test, ref.args[0], 1LLU); @@ -455,7 +453,7 @@ static void pe_test_reference(struct kunit *test) error = fwnode_property_get_reference_args(node, "ref-2", NULL, 3, 0, &ref); KUNIT_ASSERT_EQ(test, error, 0); - KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &nodes[1]); + KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &node2); KUNIT_EXPECT_EQ(test, ref.nargs, 3U); KUNIT_EXPECT_EQ(test, ref.args[0], 1LLU); KUNIT_EXPECT_EQ(test, ref.args[1], 2LLU); @@ -470,14 +468,14 @@ static void pe_test_reference(struct kunit *test) error = fwnode_property_get_reference_args(node, "ref-3", NULL, 0, 0, &ref); KUNIT_ASSERT_EQ(test, error, 0); - KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &nodes[0]); + KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &node1); KUNIT_EXPECT_EQ(test, ref.nargs, 0U); /* second reference in the array */ error = fwnode_property_get_reference_args(node, "ref-3", NULL, 2, 1, &ref); KUNIT_ASSERT_EQ(test, error, 0); - KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &nodes[1]); + KUNIT_EXPECT_PTR_EQ(test, to_software_node(ref.fwnode), &node2); KUNIT_EXPECT_EQ(test, ref.nargs, 2U); KUNIT_EXPECT_EQ(test, ref.args[0], 3LLU); KUNIT_EXPECT_EQ(test, ref.args[1], 4LLU); @@ -488,7 +486,7 @@ static void pe_test_reference(struct kunit *test) KUNIT_EXPECT_NE(test, error, 0); fwnode_remove_software_node(node); - software_node_unregister_nodes(nodes); + software_node_unregister_node_group(group); } static struct kunit_case property_entry_test_cases[] = {