From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751104AbdAWLcG (ORCPT ); Mon, 23 Jan 2017 06:32:06 -0500 Received: from mail-wm0-f42.google.com ([74.125.82.42]:38766 "EHLO mail-wm0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751016AbdAWLcF (ORCPT ); Mon, 23 Jan 2017 06:32:05 -0500 Date: Mon, 23 Jan 2017 11:36:03 +0000 From: Lee Jones To: Javier Martinez Canillas Cc: linux-kernel@vger.kernel.org, Laxman Dewangan , Krzysztof Kozlowski , Chanwoo Choi , Bartlomiej Zolnierkiewicz Subject: Re: [PATCH v2 2/4] mfd: max77686: Use of_device_get_match_data() helper Message-ID: <20170123113603.GC16020@dell> References: <1484314449-10060-1-git-send-email-javier@osg.samsung.com> <1484314449-10060-3-git-send-email-javier@osg.samsung.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1484314449-10060-3-git-send-email-javier@osg.samsung.com> User-Agent: Mutt/1.6.2 (2016-07-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 13 Jan 2017, Javier Martinez Canillas wrote: > 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(-) Applied, thanks. > 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; > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog