From patchwork Wed Apr 17 20:34:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 2456461 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AA872DF23A for ; Wed, 17 Apr 2013 20:34:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965623Ab3DQUeg (ORCPT ); Wed, 17 Apr 2013 16:34:36 -0400 Received: from bhuna.collabora.co.uk ([93.93.135.160]:37963 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965655Ab3DQUef (ORCPT ); Wed, 17 Apr 2013 16:34:35 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: javier) with ESMTPSA id 758B8169860B From: Javier Martinez Canillas Cc: Jon Hunter , Tony Lindgren , Enric Balletbo i Serra , Lars Poeschel , devicetree-discuss@lists.ozlabs.org, linux-omap , Javier Martinez Canillas Subject: [PATCH v2 2/2] ARM: OMAP2+: only WARN if a GPMC child probe function fail Date: Wed, 17 Apr 2013 22:34:12 +0200 Message-Id: <1366230852-2440-2-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1366230852-2440-1-git-send-email-javier.martinez@collabora.co.uk> References: <1366230852-2440-1-git-send-email-javier.martinez@collabora.co.uk> To: unlisted-recipients:; (no To-header on input) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org If any of the GPMC child nodes fails, this shouldn't make the whole gpmc_probe_dt() function to fail. It is better to just WARN and allow other devices probe function to succeed. Signed-off-by: Javier Martinez Canillas --- Changes since v1 (suggested by Jon Hunter): - Split the search for GPMC child nodes and only warn if a child probe fails on two different patches - Add a warn message to report which GPMC child probe failed arch/arm/mach-omap2/gpmc.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c index 6166847..6c4da12 100644 --- a/arch/arm/mach-omap2/gpmc.c +++ b/arch/arm/mach-omap2/gpmc.c @@ -1533,10 +1533,9 @@ static int gpmc_probe_dt(struct platform_device *pdev) of_node_cmp(child->name, "nor") == 0) ret = gpmc_probe_generic_child(pdev, child); - if (ret < 0) { + if (WARN(ret < 0, "%s: probing gpmc child %s failed\n", + __func__, child->full_name)) of_node_put(child); - return ret; - } } return 0;