openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: vboxvideo: Drop DRM_MODE_FB_CMD define 

This is a leftover from when the driver was out of tree and also build
against older kernels.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Hans de Goede 2018-10-22 16:57:49 +02:00 committed by Greg Kroah-Hartman
parent e46b06e1fe
commit 3a9b6ecade
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/vboxvideo/vbox_drv.h
View File

@ -164,8 +164,6 @@ void vbox_hw_fini(struct vbox_private *vbox);
int vbox_mode_init(struct vbox_private *vbox); int vbox_mode_init(struct vbox_private *vbox);
void vbox_mode_fini(struct vbox_private *vbox); void vbox_mode_fini(struct vbox_private *vbox);
#define DRM_MODE_FB_CMD drm_mode_fb_cmd2
void vbox_report_caps(struct vbox_private *vbox); void vbox_report_caps(struct vbox_private *vbox);
void vbox_framebuffer_dirty_rectangles(struct drm_framebuffer *fb, void vbox_framebuffer_dirty_rectangles(struct drm_framebuffer *fb,
@ -174,7 +172,7 @@ void vbox_framebuffer_dirty_rectangles(struct drm_framebuffer *fb,
int vbox_framebuffer_init(struct vbox_private *vbox, int vbox_framebuffer_init(struct vbox_private *vbox,
struct vbox_framebuffer *vbox_fb, struct vbox_framebuffer *vbox_fb,
const struct DRM_MODE_FB_CMD *mode_cmd, const struct drm_mode_fb_cmd2 *mode_cmd,
struct drm_gem_object *obj); struct drm_gem_object *obj);
int vboxfb_create(struct drm_fb_helper *helper, int vboxfb_create(struct drm_fb_helper *helper,

2
drivers/staging/vboxvideo/vbox_fb.c
View File

@ -51,7 +51,7 @@ int vboxfb_create(struct drm_fb_helper *helper,
struct vbox_private *vbox = struct vbox_private *vbox =
container_of(helper, struct vbox_private, fb_helper); container_of(helper, struct vbox_private, fb_helper);
struct pci_dev *pdev = vbox->ddev.pdev; struct pci_dev *pdev = vbox->ddev.pdev;
struct DRM_MODE_FB_CMD mode_cmd; struct drm_mode_fb_cmd2 mode_cmd;
struct drm_framebuffer *fb; struct drm_framebuffer *fb;
struct fb_info *info; struct fb_info *info;
struct drm_gem_object *gobj; struct drm_gem_object *gobj;

2
drivers/staging/vboxvideo/vbox_main.c
View File

@ -103,7 +103,7 @@ static const struct drm_framebuffer_funcs vbox_fb_funcs = {
int vbox_framebuffer_init(struct vbox_private *vbox, int vbox_framebuffer_init(struct vbox_private *vbox,
struct vbox_framebuffer *vbox_fb, struct vbox_framebuffer *vbox_fb,
const struct DRM_MODE_FB_CMD *mode_cmd, const struct drm_mode_fb_cmd2 *mode_cmd,
struct drm_gem_object *obj) struct drm_gem_object *obj)
{ {
int ret; int ret;