[PATCH 1/2] drm/pci: Move drm_pci_alloc/free under CONFIG_DRM_LEGACY

[Sam Ravnborg]

Hi Daniel
On Fri, Apr 03, 2020 at 01:06:09PM +0200, Daniel Vetter wrote:
> All other users have been removed, yay!
> 
> Signed-off-by: Daniel Vetter <daniel.vetter at intel.com>
> ---
>  drivers/gpu/drm/drm_pci.c |  3 +++
>  include/drm/drm_legacy.h  | 15 +++++++++++++++
>  include/drm/drm_pci.h     | 26 --------------------------
>  3 files changed, 18 insertions(+), 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 81aa21561982..131b7a139fda 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -36,6 +36,8 @@
>  #include "drm_internal.h"
>  #include "drm_legacy.h"
>  
> +#ifdef CONFIG_DRM_LEGACY
> +
>  /**
>   * drm_pci_alloc - Allocate a PCI consistent memory block, for DMA.
>   * @dev: DRM device
> @@ -93,6 +95,7 @@ void drm_pci_free(struct drm_device * dev, drm_dma_handle_t * dmah)
>  }
>  
>  EXPORT_SYMBOL(drm_pci_free);
> +#endif
>  
>  static int drm_get_pci_domain(struct drm_device *dev)
>  {
> diff --git a/include/drm/drm_legacy.h b/include/drm/drm_legacy.h
> index dcef3598f49e..b53c3686c5fc 100644
> --- a/include/drm/drm_legacy.h
> +++ b/include/drm/drm_legacy.h
> @@ -194,11 +194,26 @@ void drm_legacy_idlelock_release(struct drm_lock_data *lock);
>  
>  #ifdef CONFIG_PCI
>  
> +struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size,
> +				     size_t align);
> +void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah);
                                                                    ^
checkpatch rightfully complains about this.

With this detail fixed:
Reviewed-by: Sam Ravnborg <sam at ravnborg.org>

> +
>  int drm_legacy_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
>  void drm_legacy_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
>  
>  #else
>  
> +static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev,
> +						   size_t size, size_t align)
> +{
> +	return NULL;
> +}
> +
> +static inline void drm_pci_free(struct drm_device *dev,
> +				struct drm_dma_handle *dmah)
> +{
> +}
> +
>  static inline int drm_legacy_pci_init(struct drm_driver *driver,
>  				      struct pci_driver *pdriver)
>  {
> diff --git a/include/drm/drm_pci.h b/include/drm/drm_pci.h
> index 3941b0255ecf..1bf31131960e 100644
> --- a/include/drm/drm_pci.h
> +++ b/include/drm/drm_pci.h
> @@ -34,30 +34,4 @@
>  
>  #include <linux/pci.h>
>  
> -struct drm_dma_handle;
> -struct drm_device;
> -struct drm_driver;
> -struct drm_master;
> -
> -#ifdef CONFIG_PCI
> -
> -struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev, size_t size,
> -				     size_t align);
> -void drm_pci_free(struct drm_device *dev, struct drm_dma_handle * dmah);
> -
> -#else
> -
> -static inline struct drm_dma_handle *drm_pci_alloc(struct drm_device *dev,
> -						   size_t size, size_t align)
> -{
> -	return NULL;
> -}
> -
> -static inline void drm_pci_free(struct drm_device *dev,
> -				struct drm_dma_handle *dmah)
> -{
> -}
> -
> -#endif
> -
>  #endif /* _DRM_PCI_H_ */
> -- 
> 2.25.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel