aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-02-08 17:27:01 -0500
committerDave Airlie <airlied@redhat.com>2013-02-14 19:15:19 -0500
commit93711d8becca550154da3b9e422be77083ab51ad (patch)
tree7079033dbe17244279fd8c16de0fda428ab300f9
parentdb3985e5ca8f50fc17606855ba394783d11683a5 (diff)
drm/pci: define drm_pcie_get_speed_cap_mask() only when CONFIG_PCI=y
Move drm_pcie_get_speed_cap_mask() under #ifdef CONFIG_PCI because it it used only for PCI devices (evergreen, r600, r770), and it uses PCI interfaces that only exist when CONFIG_PCI=y. Previously, we tried to compile drm_pcie_get_speed_cap_mask() even when CONFIG_PCI=n, which fails. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_pci.c54
1 files changed, 27 insertions, 27 deletions
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
index 86102a08f65c..bd719e936e13 100644
--- a/drivers/gpu/drm/drm_pci.c
+++ b/drivers/gpu/drm/drm_pci.c
@@ -439,33 +439,6 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
439 return 0; 439 return 0;
440} 440}
441 441
442#else
443
444int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
445{
446 return -1;
447}
448
449#endif
450
451EXPORT_SYMBOL(drm_pci_init);
452
453/*@}*/
454void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
455{
456 struct drm_device *dev, *tmp;
457 DRM_DEBUG("\n");
458
459 if (driver->driver_features & DRIVER_MODESET) {
460 pci_unregister_driver(pdriver);
461 } else {
462 list_for_each_entry_safe(dev, tmp, &driver->device_list, driver_item)
463 drm_put_dev(dev);
464 }
465 DRM_INFO("Module unloaded\n");
466}
467EXPORT_SYMBOL(drm_pci_exit);
468
469int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask) 442int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
470{ 443{
471 struct pci_dev *root; 444 struct pci_dev *root;
@@ -503,3 +476,30 @@ int drm_pcie_get_speed_cap_mask(struct drm_device *dev, u32 *mask)
503 return 0; 476 return 0;
504} 477}
505EXPORT_SYMBOL(drm_pcie_get_speed_cap_mask); 478EXPORT_SYMBOL(drm_pcie_get_speed_cap_mask);
479
480#else
481
482int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
483{
484 return -1;
485}
486
487#endif
488
489EXPORT_SYMBOL(drm_pci_init);
490
491/*@}*/
492void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
493{
494 struct drm_device *dev, *tmp;
495 DRM_DEBUG("\n");
496
497 if (driver->driver_features & DRIVER_MODESET) {
498 pci_unregister_driver(pdriver);
499 } else {
500 list_for_each_entry_safe(dev, tmp, &driver->device_list, driver_item)
501 drm_put_dev(dev);
502 }
503 DRM_INFO("Module unloaded\n");
504}
505EXPORT_SYMBOL(drm_pci_exit);