Merge branch 'drm-init-cleanup' of git://people.freedesktop.org/~danvet/drm into drm-next

Next pull request, this time more of the drm de-midlayering work. The big
thing is that his patch series here removes everything from drm_bus except
the set_busid callback. Thierry has a few more patches on top of this to
make that one optional to.

With that we can ditch all the non-pci drm_bus implementations, which
Thierry has already done for the fake tegra host1x drm_bus.

Reviewed by Thierry, Laurent and David and now also survived some testing
on my intel boxes to make sure the irq fumble is fixed correctly ;-) The
last minute rebase was just to add the r-b tags from Thierry for the 2
patches I've redone.

* 'drm-init-cleanup' of git://people.freedesktop.org/~danvet/drm:
  drm/<drivers>: don't set driver->dev_priv_size to 0
  drm: Remove dev->kdriver
  drm: remove drm_bus->get_name
  drm: rip out dev->devname
  drm: inline drm_pci_set_unique
  drm: remove bus->get_irq implementations
  drm: pass the irq explicitly to drm_irq_install
  drm/irq: Look up the pci irq directly in the drm_control ioctl
  drm/irq: track the irq installed in drm_irq_install in dev->irq
  drm: rename dev->count_lock to dev->buf_lock
  drm: Rip out totally bogus vga_switcheroo->can_switch locking
  drm: kill drm_bus->bus_type
  drm: remove drm_dev_to_irq from drivers
  drm/irq: remove cargo-culted locking from irq_install/uninstall
  drm/irq: drm_control is a legacy ioctl, so pci devices only
  drm/pci: fold in irq_by_busid support
  drm/irq: simplify irq checks in drm_wait_vblank

1 files changed, 1 insertions, 6 deletions

diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index bfa6cb949545..1447b0ee3676 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -169,9 +169,6 @@ static void drm_master_destroy(struct kref *kref)
                 master->unique_len = 0;
         }
 
-        kfree(dev->devname);
-        dev->devname = NULL;
-
         list_for_each_entry_safe(pt, next, &master->magicfree, head) {
                 list_del(&pt->head);
                 drm_ht_remove_item(&master->magiclist, &pt->hash_item);
@@ -572,7 +569,7 @@ struct drm_device *drm_dev_alloc(struct drm_driver *driver,
         INIT_LIST_HEAD(&dev->maplist);
         INIT_LIST_HEAD(&dev->vblank_event_list);
 
-        spin_lock_init(&dev->count_lock);
+        spin_lock_init(&dev->buf_lock);
         spin_lock_init(&dev->event_lock);
         mutex_init(&dev->struct_mutex);
         mutex_init(&dev->ctxlist_mutex);
@@ -651,8 +648,6 @@ static void drm_dev_release(struct kref *ref)
         drm_minor_free(dev, DRM_MINOR_RENDER);
         drm_minor_free(dev, DRM_MINOR_CONTROL);
 
-        kfree(dev->devname);
-
         mutex_destroy(&dev->master_mutex);
         kfree(dev);
 }