Commit 4a6d9dd5 authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel
Browse files

amba: Stop sharing platform_dma_configure() 



Stop sharing platform_dma_configure() helper as they are about to have
their own bus dma_configure callbacks.

Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/20220418005000.897664-4-baolu.lu@linux.intel.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 25f3bcfc

drivers/amba/bus.c

+18 −1
Original line number Diff line number Diff line
@@ -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);

drivers/base/platform.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/platform_device.h

+0 −2
Original line number Diff line number Diff line
@@ -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, \