device property: ACPI: Remove unused DMA APIs
These DMA APIs are replaced with the newer versions, which return the enum dev_dma_attr. So, we can safely remove them. Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
parent
1831eff876
commit
ab3d527329
|
@ -598,19 +598,6 @@ unsigned int device_get_child_node_count(struct device *dev)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(device_get_child_node_count);
|
EXPORT_SYMBOL_GPL(device_get_child_node_count);
|
||||||
|
|
||||||
bool device_dma_is_coherent(struct device *dev)
|
|
||||||
{
|
|
||||||
bool coherent = false;
|
|
||||||
|
|
||||||
if (IS_ENABLED(CONFIG_OF) && dev->of_node)
|
|
||||||
coherent = of_dma_is_coherent(dev->of_node);
|
|
||||||
else
|
|
||||||
acpi_check_dma(ACPI_COMPANION(dev), &coherent);
|
|
||||||
|
|
||||||
return coherent;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(device_dma_is_coherent);
|
|
||||||
|
|
||||||
bool device_dma_supported(struct device *dev)
|
bool device_dma_supported(struct device *dev)
|
||||||
{
|
{
|
||||||
/* For DT, this is always supported.
|
/* For DT, this is always supported.
|
||||||
|
|
|
@ -390,40 +390,6 @@ struct acpi_data_node {
|
||||||
struct completion kobj_done;
|
struct completion kobj_done;
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent)
|
|
||||||
{
|
|
||||||
bool ret = false;
|
|
||||||
|
|
||||||
if (!adev)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Currently, we only support _CCA=1 (i.e. coherent_dma=1)
|
|
||||||
* This should be equivalent to specifyig dma-coherent for
|
|
||||||
* a device in OF.
|
|
||||||
*
|
|
||||||
* For the case when _CCA=0 (i.e. coherent_dma=0 && cca_seen=1),
|
|
||||||
* There are two cases:
|
|
||||||
* case 1. Do not support and disable DMA.
|
|
||||||
* case 2. Support but rely on arch-specific cache maintenance for
|
|
||||||
* non-coherence DMA operations.
|
|
||||||
* Currently, we implement case 2 above.
|
|
||||||
*
|
|
||||||
* For the case when _CCA is missing (i.e. cca_seen=0) and
|
|
||||||
* platform specifies ACPI_CCA_REQUIRED, we do not support DMA,
|
|
||||||
* and fallback to arch-specific default handling.
|
|
||||||
*
|
|
||||||
* See acpi_init_coherency() for more info.
|
|
||||||
*/
|
|
||||||
if (adev->flags.coherent_dma ||
|
|
||||||
(adev->flags.cca_seen && IS_ENABLED(CONFIG_ARM64))) {
|
|
||||||
ret = true;
|
|
||||||
if (coherent)
|
|
||||||
*coherent = adev->flags.coherent_dma;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool is_acpi_node(struct fwnode_handle *fwnode)
|
static inline bool is_acpi_node(struct fwnode_handle *fwnode)
|
||||||
{
|
{
|
||||||
return fwnode && (fwnode->type == FWNODE_ACPI
|
return fwnode && (fwnode->type == FWNODE_ACPI
|
||||||
|
|
|
@ -574,11 +574,6 @@ static inline int acpi_device_modalias(struct device *dev,
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool acpi_check_dma(struct acpi_device *adev, bool *coherent)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline bool acpi_dma_supported(struct acpi_device *adev)
|
static inline bool acpi_dma_supported(struct acpi_device *adev)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -174,8 +174,6 @@ struct property_set {
|
||||||
|
|
||||||
void device_add_property_set(struct device *dev, struct property_set *pset);
|
void device_add_property_set(struct device *dev, struct property_set *pset);
|
||||||
|
|
||||||
bool device_dma_is_coherent(struct device *dev);
|
|
||||||
|
|
||||||
bool device_dma_supported(struct device *dev);
|
bool device_dma_supported(struct device *dev);
|
||||||
|
|
||||||
enum dev_dma_attr device_get_dma_attr(struct device *dev);
|
enum dev_dma_attr device_get_dma_attr(struct device *dev);
|
||||||
|
|
Loading…
Reference in a new issue