From abb697f2a19ff4f1e3e4a8b8fd306b361515c93c Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Tue, 31 Jan 2017 17:53:57 -0800 Subject: cnss2: Fix issues when migrating to msm-4.4 kernel Fix the issues during migrating CNSS2 platform driver to msm-4.4 kernel. Change-Id: Ifcef708fa9394ad54c92a26a397ec60631e74ef2 CRs-fixed: 2071634 Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/pci.c | 14 ++------------ drivers/net/wireless/cnss2/power.c | 8 ++++---- 2 files changed, 6 insertions(+), 16 deletions(-) (limited to 'drivers') diff --git a/drivers/net/wireless/cnss2/pci.c b/drivers/net/wireless/cnss2/pci.c index d8ccd064ff12..5f2d6bb8daff 100644 --- a/drivers/net/wireless/cnss2/pci.c +++ b/drivers/net/wireless/cnss2/pci.c @@ -221,7 +221,6 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv) int ret = 0; struct device *dev; struct dma_iommu_mapping *mapping; - int disable_htw = 1; int atomic_ctx = 1; dev = &pci_priv->pci_dev->dev; @@ -235,15 +234,6 @@ static int cnss_pci_init_smmu(struct cnss_pci_data *pci_priv) goto out; } - ret = iommu_domain_set_attr(mapping->domain, - DOMAIN_ATTR_COHERENT_HTW_DISABLE, - &disable_htw); - if (ret) { - cnss_pr_err("Failed to set SMMU disable_htw attribute, err = %d\n", - ret); - goto release_mapping; - } - ret = iommu_domain_set_attr(mapping->domain, DOMAIN_ATTR_ATOMIC, &atomic_ctx); @@ -1529,8 +1519,8 @@ MODULE_DEVICE_TABLE(pci, cnss_pci_id_table); static const struct dev_pm_ops cnss_pm_ops = { SET_SYSTEM_SLEEP_PM_OPS(cnss_pci_suspend, cnss_pci_resume) - .suspend_noirq = cnss_pci_suspend_noirq, - .resume_noirq = cnss_pci_resume_noirq, + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(cnss_pci_suspend_noirq, + cnss_pci_resume_noirq) SET_RUNTIME_PM_OPS(cnss_pci_runtime_suspend, cnss_pci_runtime_resume, cnss_pci_runtime_idle) }; diff --git a/drivers/net/wireless/cnss2/power.c b/drivers/net/wireless/cnss2/power.c index d8b8ea957f36..8ed1507bde11 100644 --- a/drivers/net/wireless/cnss2/power.c +++ b/drivers/net/wireless/cnss2/power.c @@ -143,8 +143,8 @@ static int cnss_vreg_on(struct cnss_plat_data *plat_priv) } if (vreg_info->load_ua) { - ret = regulator_set_optimum_mode(vreg_info->reg, - vreg_info->load_ua); + ret = regulator_set_load(vreg_info->reg, + vreg_info->load_ua); if (ret < 0) { cnss_pr_err("Failed to set load for regulator %s, load: %u, err = %d\n", @@ -174,7 +174,7 @@ static int cnss_vreg_on(struct cnss_plat_data *plat_priv) regulator_disable(vreg_info->reg); if (vreg_info->load_ua) - regulator_set_optimum_mode(vreg_info->reg, 0); + regulator_set_load(vreg_info->reg, 0); if (vreg_info->min_uv != 0 && vreg_info->max_uv != 0) regulator_set_voltage(vreg_info->reg, 0, vreg_info->max_uv); @@ -212,7 +212,7 @@ static int cnss_vreg_off(struct cnss_plat_data *plat_priv) vreg_info->name, ret); if (vreg_info->load_ua) { - ret = regulator_set_optimum_mode(vreg_info->reg, 0); + ret = regulator_set_load(vreg_info->reg, 0); if (ret < 0) cnss_pr_err("Failed to set load for regulator %s, err = %d\n", vreg_info->name, ret); -- cgit v1.2.3