Commit ce44bf5b authored by David Brown's avatar David Brown Committed by Greg Kroah-Hartman
Browse files

SSBI: Remove MSM_ prefix from SSBI drivers 



Although the SSBI sub is currently only used on MSM SoCs, it is still
a bus in its own right.  Remove this msm_ prefix from the driver and
it's symbols.  Clients can now refer directly to ssbi_write() and
ssbi_read().

Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 37799ef4

drivers/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ obj-y += firmware/ 
obj-$(CONFIG_CRYPTO)		+= crypto/

obj-$(CONFIG_SUPERH)		+= sh/

obj-$(CONFIG_ARCH_SHMOBILE)	+= sh/

obj-$(CONFIG_MSM_SSBI)		+= ssbi/

obj-$(CONFIG_SSBI)		+= ssbi/

ifndef CONFIG_ARCH_USES_GETTIMEOFFSET

obj-y				+= clocksource/

endif

drivers/mfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ config MFD_PM8XXX 


config MFD_PM8921_CORE

	tristate "Qualcomm PM8921 PMIC chip"

	depends on MSM_SSBI

	depends on SSBI

	select MFD_CORE

	select MFD_PM8XXX

	help

drivers/mfd/pm8921-core.c

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

drivers/ssbi/Kconfig

+2 −2
Original line number Diff line number Diff line 
#

# MSM SSBI bus support

# SSBI bus support

#



menu "Qualcomm MSM SSBI bus support"



config MSM_SSBI

config SSBI

	tristate "Qualcomm Single-wire Serial Bus Interface (SSBI)"

	help

	  If you say yes to this option, support will be included for the

drivers/ssbi/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_MSM_SSBI) += ssbi.o
 
obj-$(CONFIG_SSBI) += ssbi.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE