diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-05-15 15:24:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-05-15 15:24:41 +1000 |
| commit | dde10068e1a4798fa44e68a5d08b5dfe3602cbba (patch) | |
| tree | 5afccf8d62b853ab8aa7b31641ebaf16fd8afe0c /drivers/gpu/drm/armada/armada_drv.c | |
| parent | 72a81683a8feac3c67bac24dfd88f81bac077be0 (diff) | |
| parent | 38bf3aee3ec7b5b264b701da14114a618cddd1a1 (diff) | |
Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into drm-next
some minor cleanups
* 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
drm/armada: armada_drv: Remove unused function
drm/armada: armada_output: Remove some unused functions
Diffstat (limited to 'drivers/gpu/drm/armada/armada_drv.c')
| -rw-r--r-- | drivers/gpu/drm/armada/armada_drv.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/gpu/drm/armada/armada_drv.c b/drivers/gpu/drm/armada/armada_drv.c index b01420c84864..225034b74cda 100644 --- a/drivers/gpu/drm/armada/armada_drv.c +++ b/drivers/gpu/drm/armada/armada_drv.c @@ -253,16 +253,6 @@ void armada_drm_vbl_event_remove(struct armada_crtc *dcrtc, } } -void armada_drm_vbl_event_remove_unlocked(struct armada_crtc *dcrtc, - struct armada_vbl_event *evt) -{ - unsigned long flags; - - spin_lock_irqsave(&dcrtc->irq_lock, flags); - armada_drm_vbl_event_remove(dcrtc, evt); - spin_unlock_irqrestore(&dcrtc->irq_lock, flags); -} - /* These are called under the vbl_lock. */ static int armada_drm_enable_vblank(struct drm_device *dev, int crtc) { |