Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

David Herrmann and committed by
Dave Airlie
c5786fe5 915b4d11

+1 -35
+1 -7
drivers/gpu/drm/drm_ioctl.c
··· 250 250 drm_unset_busid(dev, master); 251 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 253 } else { 260 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 256 "%ps. Use drm_dev_set_unique() to set the unique " 263 257 "name explicitly.", dev->driver)) 264 258 return -EINVAL;
-6
drivers/gpu/drm/drm_pci.c
··· 254 254 } 255 255 } 256 256 257 - static struct drm_bus drm_pci_bus = { 258 - .set_busid = drm_pci_set_busid, 259 - }; 260 - 261 257 /** 262 258 * drm_get_pci_dev - Register a PCI device with the DRM subsystem 263 259 * @pdev: PCI device ··· 333 337 int i; 334 338 335 339 DRM_DEBUG("\n"); 336 - 337 - driver->bus = &drm_pci_bus; 338 340 339 341 if (driver->driver_features & DRIVER_MODESET) 340 342 return pci_register_driver(pdriver);
-5
drivers/gpu/drm/drm_platform.c
··· 86 86 } 87 87 EXPORT_SYMBOL(drm_platform_set_busid); 88 88 89 - static struct drm_bus drm_platform_bus = { 90 - .set_busid = drm_platform_set_busid, 91 - }; 92 - 93 89 /** 94 90 * drm_platform_init - Register a platform device with the DRM subsystem 95 91 * @driver: DRM device driver ··· 101 105 { 102 106 DRM_DEBUG("\n"); 103 107 104 - driver->bus = &drm_platform_bus; 105 108 return drm_get_platform_dev(platform_device, driver); 106 109 } 107 110 EXPORT_SYMBOL(drm_platform_init);
-12
drivers/gpu/drm/drm_usb.c
··· 36 36 } 37 37 EXPORT_SYMBOL(drm_get_usb_dev); 38 38 39 - static int drm_usb_set_busid(struct drm_device *dev, 40 - struct drm_master *master) 41 - { 42 - return 0; 43 - } 44 - 45 - static struct drm_bus drm_usb_bus = { 46 - .set_busid = drm_usb_set_busid, 47 - }; 48 - 49 39 /** 50 40 * drm_usb_init - Register matching USB devices with the DRM subsystem 51 41 * @driver: DRM device driver ··· 50 60 { 51 61 int res; 52 62 DRM_DEBUG("\n"); 53 - 54 - driver->bus = &drm_usb_bus; 55 63 56 64 res = usb_register(udriver); 57 65 return res;
-5
include/drm/drmP.h
··· 605 605 #define DRM_SCANOUTPOS_INVBL (1 << 1) 606 606 #define DRM_SCANOUTPOS_ACCURATE (1 << 2) 607 607 608 - struct drm_bus { 609 - int (*set_busid)(struct drm_device *dev, struct drm_master *master); 610 - }; 611 - 612 608 /** 613 609 * DRM driver structure. This structure represent the common code for 614 610 * a family of cards. There will one drm_device for each card present ··· 842 846 const struct drm_ioctl_desc *ioctls; 843 847 int num_ioctls; 844 848 const struct file_operations *fops; 845 - struct drm_bus *bus; 846 849 847 850 /* List of devices hanging off this driver with stealth attach. */ 848 851 struct list_head legacy_dev_list;