lkml.org 
[lkml]   [2022]   [Feb]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v6 03/11] amba: Stop sharing platform_dma_configure()
    Date
    Stop sharing platform_dma_configure() helper as they are about to have
    their own bus dma_configure callbacks.

    Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
    ---
    include/linux/platform_device.h | 2 --
    drivers/amba/bus.c | 19 ++++++++++++++++++-
    drivers/base/platform.c | 3 +--
    3 files changed, 19 insertions(+), 5 deletions(-)

    diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
    index 7c96f169d274..17fde717df68 100644
    --- a/include/linux/platform_device.h
    +++ b/include/linux/platform_device.h
    @@ -328,8 +328,6 @@ extern int platform_pm_restore(struct device *dev);
    #define platform_pm_restore NULL
    #endif

    -extern int platform_dma_configure(struct device *dev);
    -
    #ifdef CONFIG_PM_SLEEP
    #define USE_PLATFORM_PM_SLEEP_OPS \
    .suspend = platform_pm_suspend, \
    diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
    index e1a5eca3ae3c..8392f4aa251b 100644
    --- a/drivers/amba/bus.c
    +++ b/drivers/amba/bus.c
    @@ -20,6 +20,8 @@
    #include <linux/platform_device.h>
    #include <linux/reset.h>
    #include <linux/of_irq.h>
    +#include <linux/of_device.h>
    +#include <linux/acpi.h>

    #define to_amba_driver(d) container_of(d, struct amba_driver, drv)

    @@ -273,6 +275,21 @@ static void amba_shutdown(struct device *dev)
    drv->shutdown(to_amba_device(dev));
    }

    +static int amba_dma_configure(struct device *dev)
    +{
    + enum dev_dma_attr attr;
    + int ret = 0;
    +
    + if (dev->of_node) {
    + ret = of_dma_configure(dev, dev->of_node, true);
    + } else if (has_acpi_companion(dev)) {
    + attr = acpi_get_dma_attr(to_acpi_device_node(dev->fwnode));
    + ret = acpi_dma_configure(dev, attr);
    + }
    +
    + return ret;
    +}
    +
    #ifdef CONFIG_PM
    /*
    * Hooks to provide runtime PM of the pclk (bus clock). It is safe to
    @@ -341,7 +358,7 @@ struct bus_type amba_bustype = {
    .probe = amba_probe,
    .remove = amba_remove,
    .shutdown = amba_shutdown,
    - .dma_configure = platform_dma_configure,
    + .dma_configure = amba_dma_configure,
    .pm = &amba_pm,
    };
    EXPORT_SYMBOL_GPL(amba_bustype);
    diff --git a/drivers/base/platform.c b/drivers/base/platform.c
    index 6cb04ac48bf0..acbc6eae37b8 100644
    --- a/drivers/base/platform.c
    +++ b/drivers/base/platform.c
    @@ -1454,8 +1454,7 @@ static void platform_shutdown(struct device *_dev)
    drv->shutdown(dev);
    }

    -
    -int platform_dma_configure(struct device *dev)
    +static int platform_dma_configure(struct device *dev)
    {
    enum dev_dma_attr attr;
    int ret = 0;
    --
    2.25.1
    \
     
     \ /
      Last update: 2022-02-18 02:01    [W:4.081 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site