From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966172AbbLPQe3 (ORCPT ); Wed, 16 Dec 2015 11:34:29 -0500 Received: from smtp.csie.ntu.edu.tw ([140.112.30.61]:35996 "EHLO smtp.csie.ntu.edu.tw" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934258AbbLPQcb (ORCPT ); Wed, 16 Dec 2015 11:32:31 -0500 From: Chen-Yu Tsai To: Lee Jones , Maxime Ripard Cc: Chen-Yu Tsai , 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: [PATCH v6 3/9] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device() Date: Thu, 17 Dec 2015 00:32:12 +0800 Message-Id: <1450283538-25067-4-git-send-email-wens@csie.org> X-Mailer: git-send-email 2.6.4 In-Reply-To: <1450283538-25067-1-git-send-email-wens@csie.org> References: <1450283538-25067-1-git-send-email-wens@csie.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In axp20x_match_device(), match the of_device_id table bound to the device driver instead of pointing to axp20x_of_match directly. This will allow us to keep axp20x_match_device() unmodified when we expand the axp20x driver into multiple ones covering different interface types. of_device_get_match_data() cannot be used here as we need to know if it failed to get a match, or if the match data value just happened to be 0, as it is for the AXP152. Signed-off-by: Chen-Yu Tsai --- drivers/mfd/axp20x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index 685a78614f83..3e186f2dcac3 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -613,7 +613,7 @@ static int axp20x_match_device(struct axp20x_dev *axp20x) const struct of_device_id *of_id; if (dev->of_node) { - of_id = of_match_device(axp20x_of_match, dev); + of_id = of_match_device(dev->driver->of_match_table, dev); if (!of_id) { dev_err(dev, "Unable to match OF ID\n"); return -ENODEV; -- 2.6.4