Re: [PATCH] drm/xe/pf: Remove inlined #ifdef CONFIG_PCI_IOV

[Francois Dugast <francois.dugast@intel.com>]

On Thu, Jun 27, 2024 at 12:43:05PM +0200, Michal Wajdeczko wrote:
> We can remove #ifdef CONFIG_PCI_IOV in .c files if we provide
> dummy replacement of the xe_pci_sriov_configure() function.
> 
> Suggested-by: Jani Nikula <jani.nikula@linux.intel.com>
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>

Reviewed-by: Francois Dugast <francois.dugast@intel.com>

> ---
>  drivers/gpu/drm/xe/xe_pci.c       | 4 ----
>  drivers/gpu/drm/xe/xe_pci_sriov.h | 7 +++++++
>  2 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_pci.c b/drivers/gpu/drm/xe/xe_pci.c
> index 4b91a9878f41..53b67f39c7d5 100644
> --- a/drivers/gpu/drm/xe/xe_pci.c
> +++ b/drivers/gpu/drm/xe/xe_pci.c
> @@ -749,10 +749,8 @@ static void xe_pci_remove(struct pci_dev *pdev)
>  	if (!xe) /* driver load aborted, nothing to cleanup */
>  		return;
>  
> -#ifdef CONFIG_PCI_IOV
>  	if (IS_SRIOV_PF(xe))
>  		xe_pci_sriov_configure(pdev, 0);
> -#endif
>  
>  	xe_device_remove(xe);
>  	xe_pm_runtime_fini(xe);
> @@ -1010,9 +1008,7 @@ static struct pci_driver xe_pci_driver = {
>  	.probe = xe_pci_probe,
>  	.remove = xe_pci_remove,
>  	.shutdown = xe_pci_shutdown,
> -#ifdef CONFIG_PCI_IOV
>  	.sriov_configure = xe_pci_sriov_configure,
> -#endif
>  #ifdef CONFIG_PM_SLEEP
>  	.driver.pm = &xe_pm_ops,
>  #endif
> diff --git a/drivers/gpu/drm/xe/xe_pci_sriov.h b/drivers/gpu/drm/xe/xe_pci_sriov.h
> index 3b8bfbf7e1d9..c76dd0d90495 100644
> --- a/drivers/gpu/drm/xe/xe_pci_sriov.h
> +++ b/drivers/gpu/drm/xe/xe_pci_sriov.h
> @@ -8,6 +8,13 @@
>  
>  struct pci_dev;
>  
> +#ifdef CONFIG_PCI_IOV
>  int xe_pci_sriov_configure(struct pci_dev *pdev, int num_vfs);
> +#else
> +static inline int xe_pci_sriov_configure(struct pci_dev *pdev, int num_vfs)
> +{
> +	return 0;
> +}
> +#endif
>  
>  #endif
> -- 
> 2.43.0
>