Re: [PATCH v2] PCI: endpoint: Remove API devm_pci_epc_destroy()

[Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>]

On Mon, Feb 17, 2025 at 08:26:46PM +0800, Zijun Hu wrote:
> From: Zijun Hu <quic_zijuhu@quicinc.com>
> 
> Static devm_pci_epc_match() is only invoked by API devm_pci_epc_destroy()
> and the API has not had callers since 2017-04-10 when it was introduced.
> 
> Remove both the API and the static function.
> 
> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>

Applied to pci/endpoint!

- Mani

> ---
> Changes in v2:
> - Correct commit message error pointed out by Manivannan Sadhasivam.
> - Link to v1: https://lore.kernel.org/r/20250210-remove_api-v1-1-8ae6b36e3a5c@quicinc.com
> ---
>  Documentation/PCI/endpoint/pci-endpoint.rst |  7 +++----
>  drivers/pci/endpoint/pci-epc-core.c         | 25 -------------------------
>  include/linux/pci-epc.h                     |  1 -
>  3 files changed, 3 insertions(+), 30 deletions(-)
> 
> diff --git a/Documentation/PCI/endpoint/pci-endpoint.rst b/Documentation/PCI/endpoint/pci-endpoint.rst
> index 35f82f2d45f5ef155b657e337e1eef51b85e68ac..599763aa01ca9d017b59c2c669be92a850e171c4 100644
> --- a/Documentation/PCI/endpoint/pci-endpoint.rst
> +++ b/Documentation/PCI/endpoint/pci-endpoint.rst
> @@ -57,11 +57,10 @@ by the PCI controller driver.
>     The PCI controller driver can then create a new EPC device by invoking
>     devm_pci_epc_create()/pci_epc_create().
>  
> -* devm_pci_epc_destroy()/pci_epc_destroy()
> +* pci_epc_destroy()
>  
> -   The PCI controller driver can destroy the EPC device created by either
> -   devm_pci_epc_create() or pci_epc_create() using devm_pci_epc_destroy() or
> -   pci_epc_destroy().
> +   The PCI controller driver can destroy the EPC device created by
> +   pci_epc_create() using pci_epc_destroy().
>  
>  * pci_epc_linkup()
>  
> diff --git a/drivers/pci/endpoint/pci-epc-core.c b/drivers/pci/endpoint/pci-epc-core.c
> index 9e9ca5f8e8f860a57d49ce62597b0f71ef6009ba..cf2e19b80551a2e02136a4411fc61b13e1556d7a 100644
> --- a/drivers/pci/endpoint/pci-epc-core.c
> +++ b/drivers/pci/endpoint/pci-epc-core.c
> @@ -25,13 +25,6 @@ static void devm_pci_epc_release(struct device *dev, void *res)
>  	pci_epc_destroy(epc);
>  }
>  
> -static int devm_pci_epc_match(struct device *dev, void *res, void *match_data)
> -{
> -	struct pci_epc **epc = res;
> -
> -	return *epc == match_data;
> -}
> -
>  /**
>   * pci_epc_put() - release the PCI endpoint controller
>   * @epc: epc returned by pci_epc_get()
> @@ -931,24 +924,6 @@ void pci_epc_destroy(struct pci_epc *epc)
>  }
>  EXPORT_SYMBOL_GPL(pci_epc_destroy);
>  
> -/**
> - * devm_pci_epc_destroy() - destroy the EPC device
> - * @dev: device that wants to destroy the EPC
> - * @epc: the EPC device that has to be destroyed
> - *
> - * Invoke to destroy the devres associated with this
> - * pci_epc and destroy the EPC device.
> - */
> -void devm_pci_epc_destroy(struct device *dev, struct pci_epc *epc)
> -{
> -	int r;
> -
> -	r = devres_release(dev, devm_pci_epc_release, devm_pci_epc_match,
> -			   epc);
> -	dev_WARN_ONCE(dev, r, "couldn't find PCI EPC resource\n");
> -}
> -EXPORT_SYMBOL_GPL(devm_pci_epc_destroy);
> -
>  static void pci_epc_release(struct device *dev)
>  {
>  	kfree(to_pci_epc(dev));
> diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
> index e818e3fdcded95ca053db074eb75484a2876ea6b..82a26945d038d3e45e2bbbfe3c60b7ef647f247a 100644
> --- a/include/linux/pci-epc.h
> +++ b/include/linux/pci-epc.h
> @@ -257,7 +257,6 @@ __devm_pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
>  struct pci_epc *
>  __pci_epc_create(struct device *dev, const struct pci_epc_ops *ops,
>  		 struct module *owner);
> -void devm_pci_epc_destroy(struct device *dev, struct pci_epc *epc);
>  void pci_epc_destroy(struct pci_epc *epc);
>  int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf,
>  		    enum pci_epc_interface_type type);
> 
> ---
> base-commit: 2014c95afecee3e76ca4a56956a936e23283f05b
> change-id: 20250210-remove_api-9cf1ea95901e
> 
> Best regards,
> -- 
> Zijun Hu <quic_zijuhu@quicinc.com>
> 

-- 
மணிவண்ணன் சதாசிவம்