mac80211: fix HT beacon-based channel switch handling

[deliverable/linux.git] / drivers / mfd / pm8921-core.c

diff --git a/drivers/mfd/pm8921-core.c b/drivers/mfd/pm8921-core.c
index d4b297cbd801c3929b5c4ee8c02f0c1f04a2022a..ecc137ffa8c3c6369592a5cea5ecd987f9deeed4 100644 (file)
--- a/drivers/mfd/pm8921-core.c
+++ b/drivers/mfd/pm8921-core.c
@@ -17,7 +17,7 @@
 #include <linux/platform_device.h>
 #include <linux/slab.h>
 #include <linux/err.h>
-#include <linux/msm_ssbi.h>
+#include <linux/ssbi.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/pm8xxx/pm8921.h>
 #include <linux/mfd/pm8xxx/core.h>
@@ -35,7 +35,7 @@ static int pm8921_readb(const struct device *dev, u16 addr, u8 *val)
        const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
        const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-       return msm_ssbi_read(pmic->dev->parent, addr, val, 1);
+       return ssbi_read(pmic->dev->parent, addr, val, 1);
 }
 
 static int pm8921_writeb(const struct device *dev, u16 addr, u8 val)
@@ -43,7 +43,7 @@ static int pm8921_writeb(const struct device *dev, u16 addr, u8 val)
        const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
        const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-       return msm_ssbi_write(pmic->dev->parent, addr, &val, 1);
+       return ssbi_write(pmic->dev->parent, addr, &val, 1);
 }
 
 static int pm8921_read_buf(const struct device *dev, u16 addr, u8 *buf,
@@ -52,7 +52,7 @@ static int pm8921_read_buf(const struct device *dev, u16 addr, u8 *buf,
        const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
        const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-       return msm_ssbi_read(pmic->dev->parent, addr, buf, cnt);
+       return ssbi_read(pmic->dev->parent, addr, buf, cnt);
 }
 
 static int pm8921_write_buf(const struct device *dev, u16 addr, u8 *buf,
@@ -61,7 +61,7 @@ static int pm8921_write_buf(const struct device *dev, u16 addr, u8 *buf,
        const struct pm8xxx_drvdata *pm8921_drvdata = dev_get_drvdata(dev);
        const struct pm8921 *pmic = pm8921_drvdata->pm_chip_data;
 
-       return msm_ssbi_write(pmic->dev->parent, addr, buf, cnt);
+       return ssbi_write(pmic->dev->parent, addr, buf, cnt);
 }
 
 static int pm8921_read_irq_stat(const struct device *dev, int irq)
@@ -124,7 +124,7 @@ static int pm8921_probe(struct platform_device *pdev)
        }
 
        /* Read PMIC chip revision */
-       rc = msm_ssbi_read(pdev->dev.parent, REG_HWREV, &val, sizeof(val));
+       rc = ssbi_read(pdev->dev.parent, REG_HWREV, &val, sizeof(val));
        if (rc) {
                pr_err("Failed to read hw rev reg %d:rc=%d\n", REG_HWREV, rc);
                goto err_read_rev;
@@ -133,7 +133,7 @@ static int pm8921_probe(struct platform_device *pdev)
        rev = val;
 
        /* Read PMIC chip revision 2 */
-       rc = msm_ssbi_read(pdev->dev.parent, REG_HWREV_2, &val, sizeof(val));
+       rc = ssbi_read(pdev->dev.parent, REG_HWREV_2, &val, sizeof(val));
        if (rc) {
                pr_err("Failed to read hw rev 2 reg %d:rc=%d\n",
                        REG_HWREV_2, rc);