Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ddcc64d3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: removed unused function and variable of IOMMU APIs"

parents f03b8799 9e3eefda

drivers/net/wireless/cnss2/pci.c

+0 −13
Original line number Diff line number Diff line
@@ -2255,7 +2255,6 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv) 
	cnss_pr_dbg("Initializing SMMU\n");



	pci_priv->iommu_domain = iommu_get_domain_for_dev(&pci_dev->dev);

	pci_priv->smmu_mapping.domain = pci_priv->iommu_domain;

	ret = of_property_read_string(of_node, "qcom,iommu-dma",

				      &iommu_dma_type);

	if (!ret && !strcmp("fastmap", iommu_dma_type)) {
@@ -2297,20 +2296,8 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv) 
static void cnss_pci_deinit_smmu(struct cnss_pci_data *pci_priv)

{

	pci_priv->iommu_domain = NULL;

	pci_priv->smmu_mapping.domain = NULL;

}



struct dma_iommu_mapping *cnss_smmu_get_mapping(struct device *dev)

{

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(to_pci_dev(dev));



	if (!pci_priv)

		return NULL;



	return &pci_priv->smmu_mapping;

}

EXPORT_SYMBOL(cnss_smmu_get_mapping);



struct iommu_domain *cnss_smmu_get_domain(struct device *dev)

{

	struct cnss_pci_data *pci_priv = cnss_get_pci_priv(to_pci_dev(dev));

drivers/net/wireless/cnss2/pci.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ struct cnss_pci_data { 
	u16 def_link_speed;

	u16 def_link_width;

	u8 monitor_wake_intr;

	struct dma_iommu_mapping smmu_mapping;

	struct iommu_domain *iommu_domain;

	u8 smmu_s1_enable;

	dma_addr_t smmu_iova_start;

include/net/cnss2.h

+0 −1
Original line number Diff line number Diff line
@@ -170,7 +170,6 @@ extern int cnss_get_fw_files_for_target(struct device *dev, 
					u32 target_type, u32 target_version);

extern int cnss_get_platform_cap(struct device *dev,

				 struct cnss_platform_cap *cap);

extern struct dma_iommu_mapping *cnss_smmu_get_mapping(struct device *dev);

extern struct iommu_domain *cnss_smmu_get_domain(struct device *dev);

extern int cnss_smmu_map(struct device *dev,

			 phys_addr_t paddr, uint32_t *iova_addr, size_t size);