From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758998AbcAKJZZ (ORCPT ); Mon, 11 Jan 2016 04:25:25 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:38393 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758968AbcAKJZR (ORCPT ); Mon, 11 Jan 2016 04:25:17 -0500 Date: Mon, 11 Jan 2016 09:25:13 +0000 From: Lee Jones To: Chen-Yu Tsai Cc: Maxime Ripard , Chen-Yu Tsai , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-sunxi@googlegroups.com, Hans de Goede , Mark Brown , Andy Shevchenko , Rob Herring Subject: Re: [PATCH v6 2/9] mfd: axp20x: Remove second struct device * parameter for axp20x_match_device() Message-ID: <20160111092513.GK14104@x1> References: <1450283538-25067-1-git-send-email-wens@csie.org> <1450283538-25067-3-git-send-email-wens@csie.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1450283538-25067-3-git-send-email-wens@csie.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 17 Dec 2015, Chen-Yu Tsai wrote: > The first argument passed to axp20x_match_device(), struct axp20x_dev *, > already contains a pointer to the device. By rearranging some code, > moving the assignment of the pointer before axp20x_match_device() is > called, we can eliminate the second parameter. > > Suggested-by: Andy Shevchenko > Signed-off-by: Chen-Yu Tsai > --- > drivers/mfd/axp20x.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) Acked-by: Lee Jones > diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c > index 9842199e2e6c..685a78614f83 100644 > --- a/drivers/mfd/axp20x.c > +++ b/drivers/mfd/axp20x.c > @@ -606,8 +606,9 @@ static void axp20x_power_off(void) > AXP20X_OFF); > } > > -static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev) > +static int axp20x_match_device(struct axp20x_dev *axp20x) > { > + struct device *dev = axp20x->dev; > const struct acpi_device_id *acpi_id; > const struct of_device_id *of_id; > > @@ -673,14 +674,14 @@ static int axp20x_i2c_probe(struct i2c_client *i2c, > if (!axp20x) > return -ENOMEM; > > - ret = axp20x_match_device(axp20x, &i2c->dev); > - if (ret) > - return ret; > - > axp20x->i2c_client = i2c; > axp20x->dev = &i2c->dev; > dev_set_drvdata(axp20x->dev, axp20x); > > + ret = axp20x_match_device(axp20x); > + if (ret) > + return ret; > + > axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg); > if (IS_ERR(axp20x->regmap)) { > ret = PTR_ERR(axp20x->regmap); -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog