aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/max77686.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/max77686.c')
-rw-r--r--drivers/mfd/max77686.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c
index a38e9ee1a0d9..d1f9d0433b7a 100644
--- a/drivers/mfd/max77686.c
+++ b/drivers/mfd/max77686.c
@@ -96,7 +96,6 @@ static const struct regmap_irq_chip max77686_rtc_irq_chip = {
96 .num_irqs = ARRAY_SIZE(max77686_rtc_irqs), 96 .num_irqs = ARRAY_SIZE(max77686_rtc_irqs),
97}; 97};
98 98
99#ifdef CONFIG_OF
100static const struct of_device_id max77686_pmic_dt_match[] = { 99static const struct of_device_id max77686_pmic_dt_match[] = {
101 {.compatible = "maxim,max77686", .data = NULL}, 100 {.compatible = "maxim,max77686", .data = NULL},
102 {}, 101 {},
@@ -116,13 +115,6 @@ static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device
116 dev->platform_data = pd; 115 dev->platform_data = pd;
117 return pd; 116 return pd;
118} 117}
119#else
120static struct max77686_platform_data *max77686_i2c_parse_dt_pdata(struct device
121 *dev)
122{
123 return 0;
124}
125#endif
126 118
127static int max77686_i2c_probe(struct i2c_client *i2c, 119static int max77686_i2c_probe(struct i2c_client *i2c,
128 const struct i2c_device_id *id) 120 const struct i2c_device_id *id)
@@ -132,7 +124,7 @@ static int max77686_i2c_probe(struct i2c_client *i2c,
132 unsigned int data; 124 unsigned int data;
133 int ret = 0; 125 int ret = 0;
134 126
135 if (i2c->dev.of_node) 127 if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node)
136 pdata = max77686_i2c_parse_dt_pdata(&i2c->dev); 128 pdata = max77686_i2c_parse_dt_pdata(&i2c->dev);
137 129
138 if (!pdata) { 130 if (!pdata) {