| Message ID | 20190630061922.7254-32-sam@ravnborg.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm: drop use of drmp.h in drm-misc | expand |
On Sun, Jun 30, 2019 at 08:19:20AM +0200, Sam Ravnborg wrote: > Drop use of the deprecated drmP.h header file. > Made bochs.h self-contained and then fixed > fallout in remaining files. > Several unused includes was dropped in the process. > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > Cc: Gerd Hoffmann <kraxel@redhat.com> > Cc: David Airlie <airlied@linux.ie> > Cc: Daniel Vetter <daniel@ffwll.ch> > Cc: virtualization@lists.linux-foundation.org Acked-by: Gerd Hoffmann <kraxel@redhat.com>
On Mon, Jul 01, 2019 at 08:39:08AM +0200, Gerd Hoffmann wrote: > On Sun, Jun 30, 2019 at 08:19:20AM +0200, Sam Ravnborg wrote: > > Drop use of the deprecated drmP.h header file. > > Made bochs.h self-contained and then fixed > > fallout in remaining files. > > Several unused includes was dropped in the process. > > > > Signed-off-by: Sam Ravnborg <sam@ravnborg.org> > > Cc: Gerd Hoffmann <kraxel@redhat.com> > > Cc: David Airlie <airlied@linux.ie> > > Cc: Daniel Vetter <daniel@ffwll.ch> > > Cc: virtualization@lists.linux-foundation.org > > Acked-by: Gerd Hoffmann <kraxel@redhat.com> Thanks again, applied. Sam
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h index cc35d492142c..498e96fb61b6 100644 --- a/drivers/gpu/drm/bochs/bochs.h +++ b/drivers/gpu/drm/bochs/bochs.h @@ -1,17 +1,15 @@ /* SPDX-License-Identifier: GPL-2.0 */ + #include <linux/io.h> #include <linux/console.h> -#include <drm/drmP.h> #include <drm/drm_crtc.h> #include <drm/drm_crtc_helper.h> #include <drm/drm_encoder.h> #include <drm/drm_fb_helper.h> -#include <drm/drm_simple_kms_helper.h> - #include <drm/drm_gem.h> #include <drm/drm_gem_vram_helper.h> - +#include <drm/drm_simple_kms_helper.h> #include <drm/drm_vram_mm_helper.h> /* ---------------------------------------------------------------------- */ diff --git a/drivers/gpu/drm/bochs/bochs_drv.c b/drivers/gpu/drm/bochs/bochs_drv.c index 78ad6c98861d..5d0a0060c22b 100644 --- a/drivers/gpu/drm/bochs/bochs_drv.c +++ b/drivers/gpu/drm/bochs/bochs_drv.c @@ -2,11 +2,10 @@ /* */ -#include <linux/mm.h> #include <linux/module.h> -#include <linux/slab.h> -#include <drm/drm_fb_helper.h> -#include <drm/drm_probe_helper.h> +#include <linux/pci.h> + +#include <drm/drm_drv.h> #include <drm/drm_atomic_helper.h> #include "bochs.h" diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c index 791ab2f79947..29217e696549 100644 --- a/drivers/gpu/drm/bochs/bochs_hw.c +++ b/drivers/gpu/drm/bochs/bochs_hw.c @@ -2,6 +2,10 @@ /* */ +#include <linux/pci.h> + +#include <drm/drm_fourcc.h> + #include "bochs.h" /* ---------------------------------------------------------------------- */ diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c index 5904eddc83a5..f6ae34bb2209 100644 --- a/drivers/gpu/drm/bochs/bochs_kms.c +++ b/drivers/gpu/drm/bochs/bochs_kms.c @@ -2,12 +2,14 @@ /* */ -#include "bochs.h" +#include <linux/moduleparam.h> + #include <drm/drm_atomic_helper.h> -#include <drm/drm_plane_helper.h> -#include <drm/drm_atomic_uapi.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> + +#include "bochs.h" static int defx = 1024; static int defy = 768;
Drop use of the deprecated drmP.h header file. Made bochs.h self-contained and then fixed fallout in remaining files. Several unused includes was dropped in the process. Signed-off-by: Sam Ravnborg <sam@ravnborg.org> Cc: Gerd Hoffmann <kraxel@redhat.com> Cc: David Airlie <airlied@linux.ie> Cc: Daniel Vetter <daniel@ffwll.ch> Cc: virtualization@lists.linux-foundation.org --- The list of cc: was too large to add all recipients to the cover letter. Please find cover letter here: https://lists.freedesktop.org/archives/dri-devel/2019-June/thread.html Search for "drm: drop use of drmp.h in drm-misc" Sam drivers/gpu/drm/bochs/bochs.h | 6 ++---- drivers/gpu/drm/bochs/bochs_drv.c | 7 +++---- drivers/gpu/drm/bochs/bochs_hw.c | 4 ++++ drivers/gpu/drm/bochs/bochs_kms.c | 8 +++++--- 4 files changed, 14 insertions(+), 11 deletions(-)