diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 05:34:38 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-17 20:24:39 -0500 |
| commit | 4efafebe709b8daa90b2f34a6e242eec7df98f25 (patch) | |
| tree | d887c5e4d4693527c88eb9d6fee89c5091094ac0 /include/drm | |
| parent | d6e4b28b60c5dae660aebe5cd731b21d02ca285e (diff) | |
drm: kill the ->agp_destroy callback
Call drm_pci_agp_destroy directly, there's no point in the
indirection. Long term we want to shuffle this into each driver's
unload logic, but that needs cleared-up drm lifetime rules first.
v2: Add a dummy function for !CONFIG_PCI, spotted my David Herrmann.
v3: Fixup for the coding style police.
Reviewed-by: David Herrmann <dh.herrmann@gmail.com>
Cc: David Herrmann <dh.herrmann@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'include/drm')
| -rw-r--r-- | include/drm/drmP.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 50a54c069518..8e05ff81428d 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -766,9 +766,6 @@ struct drm_bus { | |||
| 766 | int (*set_unique)(struct drm_device *dev, struct drm_master *master, | 766 | int (*set_unique)(struct drm_device *dev, struct drm_master *master, |
| 767 | struct drm_unique *unique); | 767 | struct drm_unique *unique); |
| 768 | int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p); | 768 | int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p); |
| 769 | /* hooks that are for PCI */ | ||
| 770 | void (*agp_destroy)(struct drm_device *dev); | ||
| 771 | |||
| 772 | }; | 769 | }; |
| 773 | 770 | ||
| 774 | /** | 771 | /** |
| @@ -1684,6 +1681,7 @@ static __inline__ int drm_pci_device_is_agp(struct drm_device *dev) | |||
| 1684 | 1681 | ||
| 1685 | return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP); | 1682 | return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP); |
| 1686 | } | 1683 | } |
| 1684 | void drm_pci_agp_destroy(struct drm_device *dev); | ||
| 1687 | 1685 | ||
| 1688 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); | 1686 | extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver); |
| 1689 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); | 1687 | extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver); |
