[PATCH v1 2/2] drm/r128: drop use of drmP.h

[Daniel Vetter]

On Wed, Jun 05, 2019 at 04:13:21PM +0200, Sam Ravnborg wrote:
> Drop use of the deprecated drmP.h header file.
> Replace it with relevant include files.
> Sort include files in files touched.
> 
> Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
> Cc: David Airlie <airlied at linux.ie>
> Cc: Daniel Vetter <daniel at ffwll.ch>

On both patches:

Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>

Again r128 is unmaintained, I think you can just go ahead and push.
-Daniel

> ---
>  drivers/gpu/drm/r128/r128_cce.c   | 12 ++++++++++--
>  drivers/gpu/drm/r128/r128_drv.c   |  9 ++++++---
>  drivers/gpu/drm/r128/r128_drv.h   |  6 ++++++
>  drivers/gpu/drm/r128/r128_state.c |  9 ++++++++-
>  4 files changed, 30 insertions(+), 6 deletions(-)
> 
> diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c
> index 6f426bb06934..138af32480d4 100644
> --- a/drivers/gpu/drm/r128/r128_cce.c
> +++ b/drivers/gpu/drm/r128/r128_cce.c
> @@ -29,13 +29,21 @@
>   *    Gareth Hughes <gareth at valinux.com>
>   */
>  
> +#include <linux/delay.h>
> +#include <linux/dma-mapping.h>
>  #include <linux/firmware.h>
> +#include <linux/module.h>
>  #include <linux/platform_device.h>
>  #include <linux/slab.h>
> -#include <linux/module.h>
> +#include <linux/uaccess.h>
>  
> -#include <drm/drmP.h>
> +#include <drm/drm_agpsupport.h>
> +#include <drm/drm_device.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_irq.h>
> +#include <drm/drm_print.h>
>  #include <drm/r128_drm.h>
> +
>  #include "r128_drv.h"
>  
>  #define R128_FIFO_DEBUG		0
> diff --git a/drivers/gpu/drm/r128/r128_drv.c b/drivers/gpu/drm/r128/r128_drv.c
> index 4b1a505ab353..fd74f744604f 100644
> --- a/drivers/gpu/drm/r128/r128_drv.c
> +++ b/drivers/gpu/drm/r128/r128_drv.c
> @@ -31,11 +31,14 @@
>  
>  #include <linux/module.h>
>  
> -#include <drm/drmP.h>
> +#include <drm/drm_drv.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_pci.h>
> +#include <drm/drm_pciids.h>
> +#include <drm/drm_vblank.h>
>  #include <drm/r128_drm.h>
> -#include "r128_drv.h"
>  
> -#include <drm/drm_pciids.h>
> +#include "r128_drv.h"
>  
>  static struct pci_device_id pciidlist[] = {
>  	r128_PCI_IDS
> diff --git a/drivers/gpu/drm/r128/r128_drv.h b/drivers/gpu/drm/r128/r128_drv.h
> index 115bb286dd2a..ba8c30ed91d1 100644
> --- a/drivers/gpu/drm/r128/r128_drv.h
> +++ b/drivers/gpu/drm/r128/r128_drv.h
> @@ -35,8 +35,14 @@
>  #ifndef __R128_DRV_H__
>  #define __R128_DRV_H__
>  
> +#include <linux/delay.h>
> +#include <linux/io.h>
> +#include <linux/irqreturn.h>
> +
>  #include <drm/ati_pcigart.h>
> +#include <drm/drm_ioctl.h>
>  #include <drm/drm_legacy.h>
> +#include <drm/r128_drm.h>
>  
>  /* General customization:
>   */
> diff --git a/drivers/gpu/drm/r128/r128_state.c b/drivers/gpu/drm/r128/r128_state.c
> index 2535ea8d2d9b..9d74c9d914cb 100644
> --- a/drivers/gpu/drm/r128/r128_state.c
> +++ b/drivers/gpu/drm/r128/r128_state.c
> @@ -28,8 +28,15 @@
>   *    Gareth Hughes <gareth at valinux.com>
>   */
>  
> -#include <drm/drmP.h>
> +#include <linux/pci.h>
> +#include <linux/slab.h>
> +#include <linux/uaccess.h>
> +
> +#include <drm/drm_device.h>
> +#include <drm/drm_file.h>
> +#include <drm/drm_print.h>
>  #include <drm/r128_drm.h>
> +
>  #include "r128_drv.h"
>  
>  /* ================================================================
> -- 
> 2.20.1
> 

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch