Merge branch 'drm-armada-devel' of git://ftp.arm.linux.org.uk/~rmk/linux-arm into...

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

diff --combined drivers/gpu/drm/armada/armada_drv.c
index b01420c84864b511e2b79c05777b0fb92ce02a92,7c00a90997794fd6103b92865adcb1b70d84ca20..225034b74cda7554cb6e8597c844dd77aa36558a
--- 1/drivers/gpu/drm/armada/armada_drv.c
--- 2/drivers/gpu/drm/armada/armada_drv.c
+++ b/drivers/gpu/drm/armada/armada_drv.c
@@@ -190,7 -190,6 +190,7 @@@ static int armada_drm_load(struct drm_d
        if (ret)
                goto err_comp;
  
 +      dev->irq_enabled = true;
        dev->vblank_disable_allowed = 1;
  
        ret = armada_fbdev_init(dev);
@@@ -253,16 -252,6 +253,6 @@@ void armada_drm_vbl_event_remove(struc
        }
  }
  
- 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)
  {
@@@ -332,7 -321,7 +322,7 @@@ static struct drm_driver armada_drm_dri
        .desc                   = "Armada SoC DRM",
        .date                   = "20120730",
        .driver_features        = DRIVER_GEM | DRIVER_MODESET |
 -                                DRIVER_PRIME,
 +                                DRIVER_HAVE_IRQ | DRIVER_PRIME,
        .ioctls                 = armada_ioctls,
        .fops                   = &armada_drm_fops,
  };
@@@ -486,6 -475,7 +476,6 @@@ static struct platform_driver armada_dr
        .remove = armada_drm_remove,
        .driver = {
                .name   = "armada-drm",
 -              .owner  = THIS_MODULE,
        },
        .id_table = armada_drm_platform_ids,
  };

diff --combined drivers/gpu/drm/armada/armada_output.h
index 3c4023e142d06fab06665d07b691b50db91a1cd0,d3a6ce79d0945ae1085e62d3fbcaca6590b04879..f448785753e8d0a9029051ed01676b521e6e6ef2
--- 1/drivers/gpu/drm/armada/armada_output.h
--- 2/drivers/gpu/drm/armada/armada_output.h
+++ b/drivers/gpu/drm/armada/armada_output.h
@@@ -9,7 -9,7 +9,7 @@@
  #define ARMADA_CONNETOR_H
  
  #define encoder_helper_funcs(encoder) \
 -      ((struct drm_encoder_helper_funcs *)encoder->helper_private)
 +      ((const struct drm_encoder_helper_funcs *)encoder->helper_private)
  
  struct armada_output_type {
        int connector_type;
@@@ -21,12 -21,6 +21,6 @@@
  
  struct drm_encoder *armada_drm_connector_encoder(struct drm_connector *conn);
  
- void armada_drm_encoder_prepare(struct drm_encoder *encoder);
- void armada_drm_encoder_commit(struct drm_encoder *encoder);
- 
- bool armada_drm_encoder_mode_fixup(struct drm_encoder *encoder,
-       const struct drm_display_mode *mode, struct drm_display_mode *adj);
- 
  int armada_drm_slave_encoder_mode_valid(struct drm_connector *conn,
        struct drm_display_mode *mode);