From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751597AbdALNsB (ORCPT ); Thu, 12 Jan 2017 08:48:01 -0500 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:44843 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751541AbdALNr6 (ORCPT ); Thu, 12 Jan 2017 08:47:58 -0500 From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Laxman Dewangan , Javier Martinez Canillas , Krzysztof Kozlowski , Chanwoo Choi , Bartlomiej Zolnierkiewicz , Lee Jones Subject: [PATCH 1/4] mfd: max77686: Don't attempt to get i2c_device_id .data Date: Thu, 12 Jan 2017 10:47:34 -0300 Message-Id: <1484228857-20182-2-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484228857-20182-1-git-send-email-javier@osg.samsung.com> References: <1484228857-20182-1-git-send-email-javier@osg.samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The driver is only used in platforms that have DT support so always the I2C device .data will be get from the matched OF node and never will be from the I2C device ID table. Signed-off-by: Javier Martinez Canillas --- drivers/mfd/max77686.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index 7b68ed72e9cb..ddae3bf3e46c 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -188,14 +188,11 @@ static int max77686_i2c_probe(struct i2c_client *i2c, if (!max77686) return -ENOMEM; - if (i2c->dev.of_node) { - match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node); - if (!match) - return -EINVAL; - - max77686->type = (unsigned long)match->data; - } else - max77686->type = id->driver_data; + match = of_match_node(max77686_pmic_dt_match, i2c->dev.of_node); + if (!match) + return -EINVAL; + + max77686->type = (unsigned long)match->data; i2c_set_clientdata(i2c, max77686); max77686->dev = &i2c->dev; -- 2.7.4