aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_pci.c
diff options
context:
space:
mode:
authorDaniel Vetter <daniel.vetter@ffwll.ch>2013-11-03 15:47:18 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-23 04:32:51 -0400
commit53bf2a2bca9b56e23fa8862159c75868672d7f1e (patch)
tree0c414e1e70ac8f768ddd2b3d3fa201948bdf6f9a /drivers/gpu/drm/drm_pci.c
parentb2a21aa25a39837d06eb24a7f0fef1733f9843eb (diff)
drm: inline drm_pci_set_unique
This is only used for drm versions 1.0, and kms drivers have never been there. So we can appropriately restrict this to legacy and hence pci devices and inline everything. v2: Make the dummy function actually return something, caught by Wu Fengguang's 0-day tester. v3: Fix spelling in comment (Thierry) Reviewed-by: Thierry Reding <treding@nvidia.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_pci.c')
-rw-r--r--drivers/gpu/drm/drm_pci.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index eff29e311f70..c550b349f202 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -185,9 +185,9 @@ err:
185 return ret; 185 return ret;
186} 186}
187 187
188static int drm_pci_set_unique(struct drm_device *dev, 188int drm_pci_set_unique(struct drm_device *dev,
189 struct drm_master *master, 189 struct drm_master *master,
190 struct drm_unique *u) 190 struct drm_unique *u)
191{ 191{
192 int domain, bus, slot, func, ret; 192 int domain, bus, slot, func, ret;
193 const char *bus_name; 193 const char *bus_name;
@@ -314,7 +314,6 @@ void drm_pci_agp_destroy(struct drm_device *dev)
314static struct drm_bus drm_pci_bus = { 314static struct drm_bus drm_pci_bus = {
315 .get_name = drm_pci_get_name, 315 .get_name = drm_pci_get_name,
316 .set_busid = drm_pci_set_busid, 316 .set_busid = drm_pci_set_busid,
317 .set_unique = drm_pci_set_unique,
318}; 317};
319 318
320/** 319/**
@@ -481,6 +480,13 @@ int drm_irq_by_busid(struct drm_device *dev, void *data,
481{ 480{
482 return -EINVAL; 481 return -EINVAL;
483} 482}
483
484int drm_pci_set_unique(struct drm_device *dev,
485 struct drm_master *master,
486 struct drm_unique *u)
487{
488 return -EINVAL;
489}
484#endif 490#endif
485 491
486EXPORT_SYMBOL(drm_pci_init); 492EXPORT_SYMBOL(drm_pci_init);