mfd: tps65090: make register access to inline
Laxman Dewangan [Thu, 2 Aug 2012 14:46:58 +0000 (19:46 +0530)]
Move the register access function to header and make
all register access apis to inline.

Change-Id: I78d23b73edd634145c6f9bee2f0ad08af2e51271
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: http://git-master/r/120841
Reviewed-by: Automatic_Commit_Validation_User

drivers/mfd/tps65090.c
include/linux/mfd/tps65090.h

index a4862c6..8a911ca 100644 (file)
@@ -17,7 +17,6 @@
  */
 
 #include <linux/interrupt.h>
-#include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
@@ -25,7 +24,6 @@
 #include <linux/i2c.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tps65090.h>
-#include <linux/regmap.h>
 #include <linux/err.h>
 
 #define NUM_INT_REG 2
@@ -75,50 +73,6 @@ static struct mfd_cell tps65090s[] = {
        },
 };
 
-struct tps65090 {
-       struct mutex            lock;
-       struct device           *dev;
-       struct i2c_client       *client;
-       struct regmap           *rmap;
-       struct irq_chip         irq_chip;
-       struct mutex            irq_lock;
-       int                     irq_base;
-       unsigned int            id;
-};
-
-int tps65090_write(struct device *dev, int reg, uint8_t val)
-{
-       struct tps65090 *tps = dev_get_drvdata(dev);
-       return regmap_write(tps->rmap, reg, val);
-}
-EXPORT_SYMBOL_GPL(tps65090_write);
-
-int tps65090_read(struct device *dev, int reg, uint8_t *val)
-{
-       struct tps65090 *tps = dev_get_drvdata(dev);
-       unsigned int temp_val;
-       int ret;
-       ret = regmap_read(tps->rmap, reg, &temp_val);
-       if (!ret)
-               *val = temp_val;
-       return ret;
-}
-EXPORT_SYMBOL_GPL(tps65090_read);
-
-int tps65090_set_bits(struct device *dev, int reg, uint8_t bit_num)
-{
-       struct tps65090 *tps = dev_get_drvdata(dev);
-       return regmap_update_bits(tps->rmap, reg, BIT(bit_num), ~0u);
-}
-EXPORT_SYMBOL_GPL(tps65090_set_bits);
-
-int tps65090_clr_bits(struct device *dev, int reg, uint8_t bit_num)
-{
-       struct tps65090 *tps = dev_get_drvdata(dev);
-       return regmap_update_bits(tps->rmap, reg, BIT(bit_num), 0u);
-}
-EXPORT_SYMBOL_GPL(tps65090_clr_bits);
-
 static void tps65090_irq_lock(struct irq_data *data)
 {
        struct tps65090 *tps65090 = irq_data_get_irq_chip_data(data);
index e604676..ba6b80a 100644 (file)
 #ifndef __LINUX_MFD_TPS65090_H
 #define __LINUX_MFD_TPS65090_H
 
+#include <linux/irq.h>
+#include <linux/regmap.h>
+
+struct tps65090 {
+       struct mutex            lock;
+       struct device           *dev;
+       struct i2c_client       *client;
+       struct regmap           *rmap;
+       struct irq_chip         irq_chip;
+       struct mutex            irq_lock;
+       int                     irq_base;
+       unsigned int            id;
+};
+
 struct tps65090_platform_data {
        int irq_base;
        struct tps65090_regulator_platform_data **reg_pdata;
@@ -32,9 +46,39 @@ struct tps65090_platform_data {
  * NOTE: the functions below are not intended for use outside
  * of the TPS65090 sub-device drivers
  */
-extern int tps65090_write(struct device *dev, int reg, uint8_t val);
-extern int tps65090_read(struct device *dev, int reg, uint8_t *val);
-extern int tps65090_set_bits(struct device *dev, int reg, uint8_t bit_num);
-extern int tps65090_clr_bits(struct device *dev, int reg, uint8_t bit_num);
+static inline int tps65090_write(struct device *dev, int reg, uint8_t val)
+{
+       struct tps65090 *tps = dev_get_drvdata(dev);
+
+       return regmap_write(tps->rmap, reg, val);
+}
+
+static inline int tps65090_read(struct device *dev, int reg, uint8_t *val)
+{
+       struct tps65090 *tps = dev_get_drvdata(dev);
+       unsigned int temp_val;
+       int ret;
+
+       ret = regmap_read(tps->rmap, reg, &temp_val);
+       if (!ret)
+               *val = temp_val;
+       return ret;
+}
+
+static inline int tps65090_set_bits(struct device *dev, int reg,
+               uint8_t bit_num)
+{
+       struct tps65090 *tps = dev_get_drvdata(dev);
+
+       return regmap_update_bits(tps->rmap, reg, BIT(bit_num), ~0u);
+}
+
+static inline int tps65090_clr_bits(struct device *dev, int reg,
+               uint8_t bit_num)
+{
+       struct tps65090 *tps = dev_get_drvdata(dev);
+
+       return regmap_update_bits(tps->rmap, reg, BIT(bit_num), 0u);
+}
 
 #endif /*__LINUX_MFD_TPS65090_H */