ssbi: Allow compilation as a module

The ssbi driver's read/write entry points are protected with wrappers
in the case when the driver isn't enabled.  These wrappers don't make
any sense, since a client of the SSBI bus won't work without it.  Make
these just regular functions, so that the SSBI driver can be built as
a module.

Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ssbi/Kconfig b/drivers/ssbi/Kconfig
index b57c41bd011972d6171c15a21075e13ec5b60d16..c7bc534ddf50ba802ab981dac3c086e7a055d37e 100644 (file)
--- a/drivers/ssbi/Kconfig
+++ b/drivers/ssbi/Kconfig
@@ -5,7 +5,7 @@
 menu "Qualcomm MSM SSBI bus support"
 
 config MSM_SSBI
-       bool "Qualcomm Single-wire Serial Bus Interface (SSBI)"
+       tristate "Qualcomm Single-wire Serial Bus Interface (SSBI)"
        help
          If you say yes to this option, support will be included for the
          built-in SSBI interface on Qualcomm MSM family processors.

diff --git a/include/linux/msm_ssbi.h b/include/linux/msm_ssbi.h
index cfa47df6d003f370bf91c6575a75d4a85accc21a..0fe245bb2940a4180d5b9d0c347268cc36e57d83 100644 (file)
--- a/include/linux/msm_ssbi.h
+++ b/include/linux/msm_ssbi.h
@@ -33,17 +33,6 @@ struct msm_ssbi_platform_data {
        enum msm_ssbi_controller_type controller_type;
 };
 
-#ifdef CONFIG_MSM_SSBI
 int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, int len);
 int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, int len);
-#else
-static inline int msm_ssbi_write(struct device *dev, u16 addr, u8 *buf, int len)
-{
-       return -ENXIO;
-}
-static inline int msm_ssbi_read(struct device *dev, u16 addr, u8 *buf, int len)
-{
-       return -ENXIO;
-}
-#endif
 #endif