diff options
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) | |||
250 | drm_unset_busid(dev, master); | 250 | drm_unset_busid(dev, master); |
251 | return ret; | 251 | return ret; |
252 | } | 252 | } |
253 | } else if (dev->driver->bus && dev->driver->bus->set_busid) { | ||
254 | ret = dev->driver->bus->set_busid(dev, master); | ||
255 | if (ret) { | ||
256 | drm_unset_busid(dev, master); | ||
257 | return ret; | ||
258 | } | ||
259 | } else { | 253 | } else { |
260 | if (WARN(dev->unique == NULL, | 254 | if (WARN(dev->unique == NULL, |
261 | "No drm_bus.set_busid() implementation provided by " | 255 | "No drm_driver.set_busid() implementation provided by " |
262 | "%ps. Use drm_dev_set_unique() to set the unique " | 256 | "%ps. Use drm_dev_set_unique() to set the unique " |
263 | "name explicitly.", dev->driver)) | 257 | "name explicitly.", dev->driver)) |
264 | return -EINVAL; | 258 | return -EINVAL; |