From patchwork Mon Nov 24 22:33:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Likely X-Patchwork-Id: 41430 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4C36125E18 for ; Mon, 24 Nov 2014 22:37:21 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id k14sf5822068wgh.4 for ; Mon, 24 Nov 2014 14:37:20 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=Ni//SODtUKrmhJrp4ZPexQBBxnqqqlx4WUZm1VNHchY=; b=E97BI9MAkJTJSr6u2ojwWLfd2I5oZiDofZltUNRt+J9eTM+/okpGWt2XegdhkQI4iM AEmbNbk4YgFdQy2ia+87jO+eJxYoPXaaFXidjjBgKC4rUboeoq/Z6PA8LgMuRqKYMC88 ryATCCDklQV0xBxA0E/4S+aXlWATI5lfK8CqAb1eycS38tDdO/dOi/OxC8xKAvcFvjLf Fh6uBDkNQhpnZDR2HYR/jo7LJpkcn/BvCuqREFZjhUADZjAIygs6HxcdMVmJgGTtaB8D W1UPpKiNL6pM/lseAiJCv9sfQeBoZp2O0BuYt8etWYjAGiVf0+t4Xo9umyULgwa5PwrA 787g== X-Gm-Message-State: ALoCoQlY9Chf1elHPgCsGZEu1U3/FT3S84vCmWnYw8HfD5bzBMT/x+rhQuJXZVI7vOfOcU8M8jcG X-Received: by 10.180.8.9 with SMTP id n9mr4652509wia.6.1416868640139; Mon, 24 Nov 2014 14:37:20 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.72 with SMTP id y8ls185397lay.99.gmail; Mon, 24 Nov 2014 14:37:19 -0800 (PST) X-Received: by 10.152.234.140 with SMTP id ue12mr22450511lac.78.1416868639949; Mon, 24 Nov 2014 14:37:19 -0800 (PST) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id ri4si16597504lbb.25.2014.11.24.14.37.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 24 Nov 2014 14:37:19 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by mail-lb0-f172.google.com with SMTP id u10so8269617lbd.31 for ; Mon, 24 Nov 2014 14:37:19 -0800 (PST) X-Received: by 10.152.87.100 with SMTP id w4mr22458037laz.27.1416868639524; Mon, 24 Nov 2014 14:37:19 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp347959lbc; Mon, 24 Nov 2014 14:37:18 -0800 (PST) X-Received: by 10.70.137.68 with SMTP id qg4mr37744301pdb.150.1416868637898; Mon, 24 Nov 2014 14:37:17 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sf6si8622136pbc.158.2014.11.24.14.37.17 for ; Mon, 24 Nov 2014 14:37:17 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751826AbaKXWgY (ORCPT + 26 others); Mon, 24 Nov 2014 17:36:24 -0500 Received: from mail-wg0-f53.google.com ([74.125.82.53]:56558 "EHLO mail-wg0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751309AbaKXWeN (ORCPT ); Mon, 24 Nov 2014 17:34:13 -0500 Received: by mail-wg0-f53.google.com with SMTP id l18so13368350wgh.26 for ; Mon, 24 Nov 2014 14:34:12 -0800 (PST) X-Received: by 10.194.110.4 with SMTP id hw4mr38747298wjb.102.1416868452660; Mon, 24 Nov 2014 14:34:12 -0800 (PST) Received: from trevor.secretlab.ca (host86-166-84-117.range86-166.btcentralplus.com. [86.166.84.117]) by mx.google.com with ESMTPSA id ji10sm13900660wid.7.2014.11.24.14.34.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Nov 2014 14:34:10 -0800 (PST) Received: by trevor.secretlab.ca (Postfix, from userid 1000) id 929C7C44210; Mon, 24 Nov 2014 22:33:45 +0000 (GMT) From: Grant Likely To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Pantelis Antoniou Cc: Rob Herring , Mark Brown , Wolfram Sang , Grant Likely Subject: [PATCH v2 06/14] of/reconfig: Add debug output for OF_RECONFIG notifiers Date: Mon, 24 Nov 2014 22:33:34 +0000 Message-Id: <1416868422-22103-7-git-send-email-grant.likely@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1416868422-22103-1-git-send-email-grant.likely@linaro.org> References: <1416868422-22103-1-git-send-email-grant.likely@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: grant.likely@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Add some additional debug output to cover OF_RECONFIG notifier activity. At the same time, refactor the changeset debug output to use the same strings as the notifier debug output. Signed-off-by: Grant Likely --- drivers/of/dynamic.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/drivers/of/dynamic.c b/drivers/of/dynamic.c index 6659c39ab3aa..cc106529dca8 100644 --- a/drivers/of/dynamic.c +++ b/drivers/of/dynamic.c @@ -77,10 +77,38 @@ int of_reconfig_notifier_unregister(struct notifier_block *nb) } EXPORT_SYMBOL_GPL(of_reconfig_notifier_unregister); +#ifdef DEBUG +const char *action_names[] = { + [OF_RECONFIG_ATTACH_NODE] = "ATTACH_NODE", + [OF_RECONFIG_DETACH_NODE] = "DETACH_NODE", + [OF_RECONFIG_ADD_PROPERTY] = "ADD_PROPERTY", + [OF_RECONFIG_REMOVE_PROPERTY] = "REMOVE_PROPERTY", + [OF_RECONFIG_UPDATE_PROPERTY] = "UPDATE_PROPERTY", +}; +#endif + int of_reconfig_notify(unsigned long action, void *p) { int rc; +#ifdef DEBUG + struct device_node *dn = p; + struct of_prop_reconfig *pr = p; + + switch (action) { + case OF_RECONFIG_ATTACH_NODE: + case OF_RECONFIG_DETACH_NODE: + pr_debug("of/notify %-15s %s\n", action_names[action], + dn->full_name); + break; + case OF_RECONFIG_ADD_PROPERTY: + case OF_RECONFIG_REMOVE_PROPERTY: + case OF_RECONFIG_UPDATE_PROPERTY: + pr_debug("of/notify %-15s %s:%s\n", action_names[action], + pr->dn->full_name, pr->prop->name); + break; + } +#endif rc = blocking_notifier_call_chain(&of_reconfig_chain, action, p); return notifier_to_errno(rc); } @@ -431,27 +459,15 @@ static void __of_changeset_entry_dump(struct of_changeset_entry *ce) { switch (ce->action) { case OF_RECONFIG_ADD_PROPERTY: - pr_debug("%p: %s %s/%s\n", - ce, "ADD_PROPERTY ", ce->np->full_name, - ce->prop->name); - break; case OF_RECONFIG_REMOVE_PROPERTY: - pr_debug("%p: %s %s/%s\n", - ce, "REMOVE_PROPERTY", ce->np->full_name, - ce->prop->name); - break; case OF_RECONFIG_UPDATE_PROPERTY: - pr_debug("%p: %s %s/%s\n", - ce, "UPDATE_PROPERTY", ce->np->full_name, - ce->prop->name); + pr_debug("of/cset<%p> %-15s %s/%s\n", ce, action_names[ce->action], + ce->np->full_name, ce->prop->name); break; case OF_RECONFIG_ATTACH_NODE: - pr_debug("%p: %s %s\n", - ce, "ATTACH_NODE ", ce->np->full_name); - break; case OF_RECONFIG_DETACH_NODE: - pr_debug("%p: %s %s\n", - ce, "DETACH_NODE ", ce->np->full_name); + pr_debug("of/cset<%p> %-15s %s\n", ce, action_names[ce->action], + ce->np->full_name); break; } }