[PATCH] drm: kill the ->agp_destroy callback

[David Herrmann]

Hey Daniel

On Sun, Nov 3, 2013 at 3:24 PM, Daniel Vetter <daniel.vetter at ffwll.ch> wrote:
> 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.
>
> Reviewed-by: David Herrmann <dh.herrmann at gmail.com>
> Cc: David Herrmann <dh.herrmann at gmail.com>
> Signed-off-by: Daniel Vetter <daniel.vetter at ffwll.ch>
> ---
>  drivers/gpu/drm/drm_pci.c  | 4 ++--
>  drivers/gpu/drm/drm_stub.c | 4 ++--
>  include/drm/drmP.h         | 4 +---
>  3 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c
> index 71b84997abc5..2a6ac87b2e82 100644
> --- a/drivers/gpu/drm/drm_pci.c
> +++ b/drivers/gpu/drm/drm_pci.c
> @@ -276,7 +276,7 @@ static void drm_pci_agp_init(struct drm_device *dev)
>         }
>  }
>
> -static void drm_pci_agp_destroy(struct drm_device *dev)
> +void drm_pci_agp_destroy(struct drm_device *dev)
>  {
>         if (dev->agp) {
>                 arch_phys_wc_del(dev->agp->agp_mtrr);
> @@ -293,7 +293,6 @@ static struct drm_bus drm_pci_bus = {
>         .set_busid = drm_pci_set_busid,
>         .set_unique = drm_pci_set_unique,
>         .irq_by_busid = drm_pci_irq_by_busid,
> -       .agp_destroy = drm_pci_agp_destroy,
>  };
>
>  /**
> @@ -457,6 +456,7 @@ int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
>         return -1;
>  }
>
> +void drm_pci_agp_destroy(struct drm_device *dev) { };

Looks good, but if you want to avoid getting a coding-style fixup
patch in the next week from an eager linux-next tester, I'd recommend
removing that unnecessary semicolon.

Thanks
David

>  #endif
>
>  EXPORT_SYMBOL(drm_pci_init);
> diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
> index 4b25f693ae89..3ec8d4f9f09a 100644
> --- a/drivers/gpu/drm/drm_stub.c
> +++ b/drivers/gpu/drm/drm_stub.c
> @@ -569,8 +569,8 @@ void drm_dev_unregister(struct drm_device *dev)
>         if (dev->driver->unload)
>                 dev->driver->unload(dev);
>
> -       if (dev->driver->bus->agp_destroy)
> -               dev->driver->bus->agp_destroy(dev);
> +       if (dev->agp)
> +               drm_pci_agp_destroy(dev);
>
>         drm_vblank_cleanup(dev);
>
> diff --git a/include/drm/drmP.h b/include/drm/drmP.h
> index 8cf8cfef8c56..f67104aa7b51 100644
> --- a/include/drm/drmP.h
> +++ b/include/drm/drmP.h
> @@ -748,9 +748,6 @@ struct drm_bus {
>         int (*set_unique)(struct drm_device *dev, struct drm_master *master,
>                           struct drm_unique *unique);
>         int (*irq_by_busid)(struct drm_device *dev, struct drm_irq_busid *p);
> -       /* hooks that are for PCI */
> -       void (*agp_destroy)(struct drm_device *dev);
> -
>  };
>
>  /**
> @@ -1658,6 +1655,7 @@ static __inline__ int drm_pci_device_is_agp(struct drm_device *dev)
>
>         return pci_find_capability(dev->pdev, PCI_CAP_ID_AGP);
>  }
> +void drm_pci_agp_destroy(struct drm_device *dev);
>
>  extern int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver);
>  extern void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver);
> --
> 1.8.4.rc3
>