From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751818AbdAMNe3 (ORCPT ); Fri, 13 Jan 2017 08:34:29 -0500 Received: from ec2-52-27-115-49.us-west-2.compute.amazonaws.com ([52.27.115.49]:50510 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751673AbdAMNe2 (ORCPT ); Fri, 13 Jan 2017 08:34:28 -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 v2 2/4] mfd: max77686: Use of_device_get_match_data() helper Date: Fri, 13 Jan 2017 10:34:06 -0300 Message-Id: <1484314449-10060-3-git-send-email-javier@osg.samsung.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1484314449-10060-1-git-send-email-javier@osg.samsung.com> References: <1484314449-10060-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 Use the generic helper to get the matched of_device_id .data, instead of open coding it. The driver was checking if matching the OF node with the driver's OF table was failing, but this doesn't make too much sense since this can't happen in practice. The fact the probe function was called, means OF registered a device with a valid compatible string so a of_device_get_match_data() call will always succeed. So just remove this unneeded check. Signed-off-by: Javier Martinez Canillas Acked-by: Laxman Dewangan --- Changes in v2: - Add Laxman's Acked-by tag to patch 2/4. - Mention in commit message that an unneeded check for match is removed. drivers/mfd/max77686.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/mfd/max77686.c b/drivers/mfd/max77686.c index ddae3bf3e46c..33dd09493605 100644 --- a/drivers/mfd/max77686.c +++ b/drivers/mfd/max77686.c @@ -34,6 +34,7 @@ #include #include #include +#include static const struct mfd_cell max77686_devs[] = { { .name = "max77686-pmic", }, @@ -175,7 +176,6 @@ static int max77686_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { struct max77686_dev *max77686 = NULL; - const struct of_device_id *match; unsigned int data; int ret = 0; const struct regmap_config *config; @@ -188,13 +188,8 @@ static int max77686_i2c_probe(struct i2c_client *i2c, if (!max77686) return -ENOMEM; - 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->type = (unsigned long)of_device_get_match_data(&i2c->dev); max77686->dev = &i2c->dev; max77686->i2c = i2c; -- 2.7.4