Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/shmob: Nuke preclose hook

Again since the drm core takes care of event unlinking/disarming this
is now just needless code.

v2: Fixup misplaced hunk.

Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com> (v1)
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1453756616-28942-11-git-send-email-daniel.vetter@ffwll.ch

-30
-20
drivers/gpu/drm/shmobile/shmob_drm_crtc.c
··· 438 438 .mode_set_base = shmob_drm_crtc_mode_set_base, 439 439 }; 440 440 441 - void shmob_drm_crtc_cancel_page_flip(struct shmob_drm_crtc *scrtc, 442 - struct drm_file *file) 443 - { 444 - struct drm_pending_vblank_event *event; 445 - struct drm_device *dev = scrtc->crtc.dev; 446 - unsigned long flags; 447 - 448 - /* Destroy the pending vertical blanking event associated with the 449 - * pending page flip, if any, and disable vertical blanking interrupts. 450 - */ 451 - spin_lock_irqsave(&dev->event_lock, flags); 452 - event = scrtc->event; 453 - if (event && event->base.file_priv == file) { 454 - scrtc->event = NULL; 455 - event->base.destroy(&event->base); 456 - drm_vblank_put(dev, 0); 457 - } 458 - spin_unlock_irqrestore(&dev->event_lock, flags); 459 - } 460 - 461 441 void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc) 462 442 { 463 443 struct drm_pending_vblank_event *event;
-2
drivers/gpu/drm/shmobile/shmob_drm_crtc.h
··· 47 47 48 48 int shmob_drm_crtc_create(struct shmob_drm_device *sdev); 49 49 void shmob_drm_crtc_enable_vblank(struct shmob_drm_device *sdev, bool enable); 50 - void shmob_drm_crtc_cancel_page_flip(struct shmob_drm_crtc *scrtc, 51 - struct drm_file *file); 52 50 void shmob_drm_crtc_finish_page_flip(struct shmob_drm_crtc *scrtc); 53 51 void shmob_drm_crtc_suspend(struct shmob_drm_crtc *scrtc); 54 52 void shmob_drm_crtc_resume(struct shmob_drm_crtc *scrtc);
-8
drivers/gpu/drm/shmobile/shmob_drm_drv.c
··· 200 200 return ret; 201 201 } 202 202 203 - static void shmob_drm_preclose(struct drm_device *dev, struct drm_file *file) 204 - { 205 - struct shmob_drm_device *sdev = dev->dev_private; 206 - 207 - shmob_drm_crtc_cancel_page_flip(&sdev->crtc, file); 208 - } 209 - 210 203 static irqreturn_t shmob_drm_irq(int irq, void *arg) 211 204 { 212 205 struct drm_device *dev = arg; ··· 259 266 | DRIVER_PRIME, 260 267 .load = shmob_drm_load, 261 268 .unload = shmob_drm_unload, 262 - .preclose = shmob_drm_preclose, 263 269 .set_busid = drm_platform_set_busid, 264 270 .irq_handler = shmob_drm_irq, 265 271 .get_vblank_counter = drm_vblank_no_hw_counter,