From patchwork Wed Sep 29 13:37:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 12525599 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2B70C433EF for ; Wed, 29 Sep 2021 13:37:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA3CF613A7 for ; Wed, 29 Sep 2021 13:37:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344301AbhI2NjM (ORCPT ); Wed, 29 Sep 2021 09:39:12 -0400 Received: from mga18.intel.com ([134.134.136.126]:59006 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344291AbhI2NjL (ORCPT ); Wed, 29 Sep 2021 09:39:11 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="212025192" X-IronPort-AV: E=Sophos;i="5.85,332,1624345200"; d="scan'208";a="212025192" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 06:37:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,332,1624345200"; d="scan'208";a="617514196" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 29 Sep 2021 06:37:26 -0700 From: Heikki Krogerus To: Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: Bjorn Helgaas , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH 1/2] PCI: Use software node API with additional device properties Date: Wed, 29 Sep 2021 16:37:28 +0300 Message-Id: <20210929133729.9427-2-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929133729.9427-1-heikki.krogerus@linux.intel.com> References: <20210929133729.9427-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Using device_create_managed_software_node() to inject the properties in quirk_huawei_pcie_sva() instead of with the old device_add_properties() API. Signed-off-by: Heikki Krogerus Acked-by: Zhangfei Gao --- drivers/pci/quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index b6b4c803bdc94..fe5eedba47908 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1850,7 +1850,7 @@ static void quirk_huawei_pcie_sva(struct pci_dev *pdev) * can set it directly. */ if (!pdev->dev.of_node && - device_add_properties(&pdev->dev, properties)) + device_create_managed_software_node(&pdev->dev, properties, NULL)) pci_warn(pdev, "could not add stall property"); } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_HUAWEI, 0xa250, quirk_huawei_pcie_sva); From patchwork Wed Sep 29 13:37:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heikki Krogerus X-Patchwork-Id: 12525601 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7617FC4332F for ; Wed, 29 Sep 2021 13:37:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E6C161216 for ; Wed, 29 Sep 2021 13:37:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344305AbhI2NjO (ORCPT ); Wed, 29 Sep 2021 09:39:14 -0400 Received: from mga18.intel.com ([134.134.136.126]:59006 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344296AbhI2NjM (ORCPT ); Wed, 29 Sep 2021 09:39:12 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10122"; a="212025201" X-IronPort-AV: E=Sophos;i="5.85,332,1624345200"; d="scan'208";a="212025201" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Sep 2021 06:37:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,332,1624345200"; d="scan'208";a="617514210" Received: from black.fi.intel.com (HELO black.fi.intel.com.) ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 29 Sep 2021 06:37:28 -0700 From: Heikki Krogerus To: Greg Kroah-Hartman , "Rafael J. Wysocki" Cc: Bjorn Helgaas , Andy Shevchenko , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Subject: [PATCH 2/2] device property: Remove device_add_properties() API Date: Wed, 29 Sep 2021 16:37:29 +0300 Message-Id: <20210929133729.9427-3-heikki.krogerus@linux.intel.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210929133729.9427-1-heikki.krogerus@linux.intel.com> References: <20210929133729.9427-1-heikki.krogerus@linux.intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org There are no more users for it. Signed-off-by: Heikki Krogerus --- drivers/base/core.c | 1 - drivers/base/property.c | 48 ---------------------------------------- include/linux/property.h | 4 ---- 3 files changed, 53 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 7758223f040c8..7935ee642fa3f 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -3573,7 +3573,6 @@ void device_del(struct device *dev) device_pm_remove(dev); driver_deferred_probe_del(dev); device_platform_notify_remove(dev); - device_remove_properties(dev); device_links_purge(dev); if (dev->bus) diff --git a/drivers/base/property.c b/drivers/base/property.c index 453918eb7390c..1f1eee37817e0 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -508,54 +508,6 @@ struct fwnode_handle *fwnode_find_reference(const struct fwnode_handle *fwnode, } EXPORT_SYMBOL_GPL(fwnode_find_reference); -/** - * device_remove_properties - Remove properties from a device object. - * @dev: Device whose properties to remove. - * - * The function removes properties previously associated to the device - * firmware node with device_add_properties(). Memory allocated to the - * properties will also be released. - */ -void device_remove_properties(struct device *dev) -{ - struct fwnode_handle *fwnode = dev_fwnode(dev); - - if (!fwnode) - return; - - if (is_software_node(fwnode->secondary)) { - fwnode_remove_software_node(fwnode->secondary); - set_secondary_fwnode(dev, NULL); - } -} -EXPORT_SYMBOL_GPL(device_remove_properties); - -/** - * device_add_properties - Add a collection of properties to a device object. - * @dev: Device to add properties to. - * @properties: Collection of properties to add. - * - * Associate a collection of device properties represented by @properties with - * @dev. The function takes a copy of @properties. - * - * WARNING: The callers should not use this function if it is known that there - * is no real firmware node associated with @dev! In that case the callers - * should create a software node and assign it to @dev directly. - */ -int device_add_properties(struct device *dev, - const struct property_entry *properties) -{ - struct fwnode_handle *fwnode; - - fwnode = fwnode_create_software_node(properties, NULL); - if (IS_ERR(fwnode)) - return PTR_ERR(fwnode); - - set_secondary_fwnode(dev, fwnode); - return 0; -} -EXPORT_SYMBOL_GPL(device_add_properties); - /** * fwnode_get_name - Return the name of a node * @fwnode: The firmware node diff --git a/include/linux/property.h b/include/linux/property.h index 357513a977e5d..daf0b5841286f 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -377,10 +377,6 @@ property_entries_dup(const struct property_entry *properties); void property_entries_free(const struct property_entry *properties); -int device_add_properties(struct device *dev, - const struct property_entry *properties); -void device_remove_properties(struct device *dev); - bool device_dma_supported(struct device *dev); enum dev_dma_attr device_get_dma_attr(struct device *dev);