summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Ortiz <sameo@linux.intel.com>2012-05-23 16:23:21 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2012-05-23 16:24:14 +0200
commitca2cad6ae38ea0ff27a7a7a00bfaa571fbe9051f (patch)
tree24911bc764dc4956401178ff4fac7d0cef2cf628
parent78302a194c0ddf4438e50e3f9b327a6dce6bc8fc (diff)
downloadop-kernel-dev-ca2cad6ae38ea0ff27a7a7a00bfaa571fbe9051f.zip
op-kernel-dev-ca2cad6ae38ea0ff27a7a7a00bfaa571fbe9051f.tar.gz
mfd: Fix twl6040 build failure
Without it we get: CC drivers/mfd/twl6040-core.o drivers/mfd/twl6040-core.c: In function ‘twl6040_has_vibra’: drivers/mfd/twl6040-core.c:55:2: error: implicit declaration of function ‘of_find_node_by_name’ [-Werror=implicit-function-declaration] Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
-rw-r--r--drivers/mfd/twl6040-core.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/mfd/twl6040-core.c b/drivers/mfd/twl6040-core.c
index 450a28f..4ded9e7 100644
--- a/drivers/mfd/twl6040-core.c
+++ b/drivers/mfd/twl6040-core.c
@@ -45,6 +45,20 @@
#define VIBRACTRL_MEMBER(reg) ((reg == TWL6040_REG_VIBCTLL) ? 0 : 1)
#define TWL6040_NUM_SUPPLIES (2)
+static bool twl6040_has_vibra(struct twl6040_platform_data *pdata,
+ struct device_node *node)
+{
+ if (pdata && pdata->vibra)
+ return true;
+
+#ifdef CONFIG_OF
+ if (of_find_node_by_name(node, "vibra"))
+ return true;
+#endif
+
+ return false;
+}
+
int twl6040_reg_read(struct twl6040 *twl6040, unsigned int reg)
{
int ret;
@@ -617,7 +631,7 @@ static int __devinit twl6040_probe(struct i2c_client *client,
}
children++;
- if ((pdata && pdata->vibra) || of_find_node_by_name(node, "vibra")) {
+ if (twl6040_has_vibra(pdata, node)) {
irq = twl6040->irq_base + TWL6040_IRQ_VIB;
cell = &twl6040->cells[children];
OpenPOWER on IntegriCloud