lkml.org 
[lkml]   [2023]   [Jan]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 10/11] video/aperture: Drop primary argument
    Date
    With the preceeding patches it's become defunct. Also I'm about to add
    a different boolean argument, so it's better to keep the confusion
    down to the absolute minimum.

    Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
    Cc: Thomas Zimmermann <tzimmermann@suse.de>
    Cc: Javier Martinez Canillas <javierm@redhat.com>
    Cc: Helge Deller <deller@gmx.de>
    Cc: linux-fbdev@vger.kernel.org
    ---
    drivers/gpu/drm/drm_aperture.c | 2 +-
    drivers/video/aperture.c | 7 +++----
    include/linux/aperture.h | 9 ++++-----
    3 files changed, 8 insertions(+), 10 deletions(-)

    diff --git a/drivers/gpu/drm/drm_aperture.c b/drivers/gpu/drm/drm_aperture.c
    index 697cffbfd603..5729f3bb4398 100644
    --- a/drivers/gpu/drm/drm_aperture.c
    +++ b/drivers/gpu/drm/drm_aperture.c
    @@ -168,7 +168,7 @@ EXPORT_SYMBOL(devm_aperture_acquire_from_firmware);
    int drm_aperture_remove_conflicting_framebuffers(resource_size_t base, resource_size_t size,
    const struct drm_driver *req_driver)
    {
    - return aperture_remove_conflicting_devices(base, size, false, req_driver->name);
    + return aperture_remove_conflicting_devices(base, size, req_driver->name);
    }
    EXPORT_SYMBOL(drm_aperture_remove_conflicting_framebuffers);

    diff --git a/drivers/video/aperture.c b/drivers/video/aperture.c
    index 03f8a5e95238..ba565515480d 100644
    --- a/drivers/video/aperture.c
    +++ b/drivers/video/aperture.c
    @@ -43,7 +43,7 @@
    * base = mem->start;
    * size = resource_size(mem);
    *
    - * ret = aperture_remove_conflicting_devices(base, size, false, "example");
    + * ret = aperture_remove_conflicting_devices(base, size, "example");
    * if (ret)
    * return ret;
    *
    @@ -274,7 +274,6 @@ static void aperture_detach_devices(resource_size_t base, resource_size_t size)
    * aperture_remove_conflicting_devices - remove devices in the given range
    * @base: the aperture's base address in physical memory
    * @size: aperture size in bytes
    - * @primary: also kick vga16fb if present; only relevant for VGA devices
    * @name: a descriptive name of the requesting driver
    *
    * This function removes devices that own apertures within @base and @size.
    @@ -283,7 +282,7 @@ static void aperture_detach_devices(resource_size_t base, resource_size_t size)
    * 0 on success, or a negative errno code otherwise
    */
    int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t size,
    - bool primary, const char *name)
    + const char *name)
    {
    /*
    * If a driver asked to unregister a platform device registered by
    @@ -328,7 +327,7 @@ int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *na

    base = pci_resource_start(pdev, bar);
    size = pci_resource_len(pdev, bar);
    - ret = aperture_remove_conflicting_devices(base, size, primary, name);
    + ret = aperture_remove_conflicting_devices(base, size, name);
    if (ret)
    return ret;
    }
    diff --git a/include/linux/aperture.h b/include/linux/aperture.h
    index 442f15a57cad..7248727753be 100644
    --- a/include/linux/aperture.h
    +++ b/include/linux/aperture.h
    @@ -14,7 +14,7 @@ int devm_aperture_acquire_for_platform_device(struct platform_device *pdev,
    resource_size_t size);

    int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t size,
    - bool primary, const char *name);
    + const char *name);

    int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev, const char *name);
    #else
    @@ -26,7 +26,7 @@ static inline int devm_aperture_acquire_for_platform_device(struct platform_devi
    }

    static inline int aperture_remove_conflicting_devices(resource_size_t base, resource_size_t size,
    - bool primary, const char *name)
    + const char *name)
    {
    return 0;
    }
    @@ -39,7 +39,6 @@ static inline int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev,

    /**
    * aperture_remove_all_conflicting_devices - remove all existing framebuffers
    - * @primary: also kick vga16fb if present; only relevant for VGA devices
    * @name: a descriptive name of the requesting driver
    *
    * This function removes all graphics device drivers. Use this function on systems
    @@ -48,9 +47,9 @@ static inline int aperture_remove_conflicting_pci_devices(struct pci_dev *pdev,
    * Returns:
    * 0 on success, or a negative errno code otherwise
    */
    -static inline int aperture_remove_all_conflicting_devices(bool primary, const char *name)
    +static inline int aperture_remove_all_conflicting_devices(const char *name)
    {
    - return aperture_remove_conflicting_devices(0, (resource_size_t)-1, primary, name);
    + return aperture_remove_conflicting_devices(0, (resource_size_t)-1, name);
    }

    #endif
    --
    2.39.0
    \
     
     \ /
      Last update: 2023-03-26 23:35    [W:4.223 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site