diff options
| author | David Herrmann <dh.herrmann@gmail.com> | 2014-08-29 12:12:44 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-09-10 17:43:10 +1000 |
| commit | c5786fe5f1c50941dbe27fc8b4aa1afee46ae893 (patch) | |
| tree | a2a8786bdb77a90b319c4e0ced2bf8cceff52f01 /drivers/gpu/drm/drm_ioctl.c | |
| parent | 915b4d11b8b9e7b84ba4a4645b6cc7fbc0c071cf (diff) | |
| download | talos-obmc-linux-c5786fe5f1c50941dbe27fc8b4aa1afee46ae893.tar.gz talos-obmc-linux-c5786fe5f1c50941dbe27fc8b4aa1afee46ae893.zip | |
drm: Goody bye, drm_bus!
..we will not miss you..
Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
Reviewed-by: Thierry Reding <treding@nvidia.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_ioctl.c')
| -rw-r--r-- | drivers/gpu/drm/drm_ioctl.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 4770bd78b307..3a1349f82b41 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -250,15 +250,9 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv) drm_unset_busid(dev, master); return ret; } - } else if (dev->driver->bus && dev->driver->bus->set_busid) { - ret = dev->driver->bus->set_busid(dev, master); - if (ret) { - drm_unset_busid(dev, master); - return ret; - } } else { if (WARN(dev->unique == NULL, - "No drm_bus.set_busid() implementation provided by " + "No drm_driver.set_busid() implementation provided by " "%ps. Use drm_dev_set_unique() to set the unique " "name explicitly.", dev->driver)) return -EINVAL; |
