[PATCH 12/22] xfree86: Remove xf86ConfigActivePciEntity

[Alex Deucher]

On Tue, Jul 22, 2014 at 11:46 AM, Adam Jackson <ajax at redhat.com> wrote:
> The giant OBSOLETE DO NOT USE comment has been there since 2000,
> probably it's safe to nuke by now.
>
> Signed-off-by: Adam Jackson <ajax at redhat.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  hw/xfree86/common/xf86.h       |  8 --------
>  hw/xfree86/common/xf86pciBus.c | 27 ---------------------------
>  2 files changed, 35 deletions(-)
>
> diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
> index cec3135..49ff35b 100644
> --- a/hw/xfree86/common/xf86.h
> +++ b/hw/xfree86/common/xf86.h
> @@ -129,14 +129,6 @@ extern _X_EXPORT ScrnInfoPtr xf86ConfigPciEntity(ScrnInfoPtr pScrn,
>                                                   EntityProc enter,
>                                                   EntityProc leave,
>                                                   void *private);
> -/* Obsolete! don't use */
> -extern _X_EXPORT Bool xf86ConfigActivePciEntity(ScrnInfoPtr pScrn,
> -                                                int entityIndex,
> -                                                PciChipsets * p_chip,
> -                                                void *dummy, EntityProc init,
> -                                                EntityProc enter,
> -                                                EntityProc leave,
> -                                                void *private);
>  #else
>  #define xf86VGAarbiterInit() do {} while (0)
>  #define xf86VGAarbiterFini() do {} while (0)
> diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
> index c06b040..33fbd7f 100644
> --- a/hw/xfree86/common/xf86pciBus.c
> +++ b/hw/xfree86/common/xf86pciBus.c
> @@ -1061,33 +1061,6 @@ xf86ConfigPciEntity(ScrnInfoPtr pScrn, int scrnFlag, int entityIndex,
>      return pScrn;
>  }
>
> -/*
> - *  OBSOLETE ! xf86ConfigActivePciEntity() is an obsolete function.
> - *             It is likely to be removed. Don't use!
> - */
> -Bool
> -xf86ConfigActivePciEntity(ScrnInfoPtr pScrn, int entityIndex,
> -                          PciChipsets * p_chip, void *dummy, EntityProc init,
> -                          EntityProc enter, EntityProc leave, void *private)
> -{
> -    EntityInfoPtr pEnt = xf86GetEntityInfo(entityIndex);
> -
> -    if (!pEnt)
> -        return FALSE;
> -
> -    if (!pEnt->active || !(pEnt->location.type == BUS_PCI)) {
> -        free(pEnt);
> -        return FALSE;
> -    }
> -    xf86AddEntityToScreen(pScrn, entityIndex);
> -
> -    free(pEnt);
> -    if (!xf86SetEntityFuncs(entityIndex, init, enter, leave, private))
> -        return FALSE;
> -
> -    return TRUE;
> -}
> -
>  int
>  xf86VideoPtrToDriverList(struct pci_device *dev,
>                       char *returnList[], int returnListMax)
> --
> 1.9.3
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel