From: Grant Likely <grant.likely@secretlab.ca>
To: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 7/8] irqdomain: trivial pr_fmt conversion.
Date: Sat, 19 May 2012 18:49:14 +0000 [thread overview]
Message-ID: <20120519184915.772FE3E03B8@localhost> (raw)
In-Reply-To: <1337407908-7421-8-git-send-email-lethal@linux-sh.org>
On Sat, 19 May 2012 15:11:47 +0900, Paul Mundt <lethal@linux-sh.org> wrote:
> Convert to pr_fmt before things start to get out of hand and some
> janitors start getting overly excited.
>
> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Applied, thanks.
g.
> ---
> kernel/irq/irqdomain.c | 36 +++++++++++++++++++-----------------
> 1 files changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
> index ac44781..e8ac7df 100644
> --- a/kernel/irq/irqdomain.c
> +++ b/kernel/irq/irqdomain.c
> @@ -1,3 +1,5 @@
> +#define pr_fmt(fmt) "irq: " fmt
> +
> #include <linux/debugfs.h>
> #include <linux/hardirq.h>
> #include <linux/interrupt.h>
> @@ -124,7 +126,7 @@ void irq_domain_remove(struct irq_domain *domain)
>
> mutex_unlock(&irq_domain_mutex);
>
> - pr_debug("irq: Removed domain of type %d @0x%p\n",
> + pr_debug("Removed domain of type %d @0x%p\n",
> domain->revmap_type, domain);
>
> irq_domain_free(domain);
> @@ -329,7 +331,7 @@ EXPORT_SYMBOL_GPL(irq_find_host);
> */
> void irq_set_default_host(struct irq_domain *domain)
> {
> - pr_debug("irq: Default domain set to @0x%p\n", domain);
> + pr_debug("Default domain set to @0x%p\n", domain);
>
> irq_default_domain = domain;
> }
> @@ -343,7 +345,7 @@ static int irq_setup_virq(struct irq_domain *domain, unsigned int virq,
> irq_data->hwirq = hwirq;
> irq_data->domain = domain;
> if (domain->ops->map(domain, virq, hwirq)) {
> - pr_debug("irq: -> mapping failed, freeing\n");
> + pr_debug("-> mapping failed, freeing\n");
> irq_data->domain = NULL;
> irq_data->hwirq = 0;
> return -1;
> @@ -374,7 +376,7 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain)
>
> virq = irq_alloc_desc_from(1, irq_domain_nid(domain->of_node));
> if (!virq) {
> - pr_debug("irq: create_direct virq allocation failed\n");
> + pr_debug("create_direct virq allocation failed\n");
> return 0;
> }
> if (virq >= domain->revmap_data.nomap.max_irq) {
> @@ -383,7 +385,7 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain)
> irq_free_desc(virq);
> return 0;
> }
> - pr_debug("irq: create_direct obtained virq %d\n", virq);
> + pr_debug("create_direct obtained virq %d\n", virq);
>
> if (irq_setup_virq(domain, virq, virq)) {
> irq_free_desc(virq);
> @@ -410,23 +412,23 @@ unsigned int irq_create_mapping(struct irq_domain *domain,
> unsigned int hint;
> int virq;
>
> - pr_debug("irq: irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq);
> + pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq);
>
> /* Look for default domain if nececssary */
> if (domain = NULL)
> domain = irq_default_domain;
> if (domain = NULL) {
> - printk(KERN_WARNING "irq_create_mapping called for"
> - " NULL domain, hwirq=%lx\n", hwirq);
> + pr_warning("irq_create_mapping called for"
> + " NULL domain, hwirq=%lx\n", hwirq);
> WARN_ON(1);
> return 0;
> }
> - pr_debug("irq: -> using domain @%p\n", domain);
> + pr_debug("-> using domain @%p\n", domain);
>
> /* Check if mapping already exists */
> virq = irq_find_mapping(domain, hwirq);
> if (virq) {
> - pr_debug("irq: -> existing mapping on virq %d\n", virq);
> + pr_debug("-> existing mapping on virq %d\n", virq);
> return virq;
> }
>
> @@ -442,7 +444,7 @@ unsigned int irq_create_mapping(struct irq_domain *domain,
> if (virq <= 0)
> virq = irq_alloc_desc_from(1, irq_domain_nid(domain->of_node));
> if (virq <= 0) {
> - pr_debug("irq: -> virq allocation failed\n");
> + pr_debug("-> virq allocation failed\n");
> return 0;
> }
>
> @@ -452,7 +454,7 @@ unsigned int irq_create_mapping(struct irq_domain *domain,
> return 0;
> }
>
> - pr_debug("irq: irq %lu on domain %s mapped to virtual irq %u\n",
> + pr_debug("irq %lu on domain %s mapped to virtual irq %u\n",
> hwirq, domain->of_node ? domain->of_node->full_name : "null", virq);
>
> return virq;
> @@ -472,7 +474,7 @@ unsigned int irq_create_identity_mapping(struct irq_domain *domain,
> {
> int virq;
>
> - pr_debug("irq: irq_create_identity_mapping(0x%p, 0x%lx)\n",
> + pr_debug("irq_create_identity_mapping(0x%p, 0x%lx)\n",
> domain, hwirq);
>
> if (domain = NULL)
> @@ -484,7 +486,7 @@ unsigned int irq_create_identity_mapping(struct irq_domain *domain,
>
> virq = irq_alloc_desc_at(hwirq, irq_domain_nid(domain->of_node));
> if (virq < 0) {
> - pr_debug("irq: -> virq allocation failed\n");
> + pr_debug("-> virq allocation failed\n");
> return 0;
> }
>
> @@ -494,7 +496,7 @@ unsigned int irq_create_identity_mapping(struct irq_domain *domain,
> return 0;
> }
>
> - pr_debug("irq: irq %lu identity mapped\n", hwirq);
> + pr_debug("irq %lu identity mapped\n", hwirq);
>
> return virq;
> }
> @@ -522,8 +524,8 @@ unsigned int irq_create_of_mapping(struct device_node *controller,
> if (intsize > 0)
> return intspec[0];
> #endif
> - printk(KERN_WARNING "irq: no irq domain found for %s !\n",
> - controller->full_name);
> + pr_warning("no irq domain found for %s !\n",
> + controller->full_name);
> return 0;
> }
>
> --
> 1.7.9.rc0.28.g0e1cf
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
next prev parent reply other threads:[~2012-05-19 18:49 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-19 6:11 [PATCH 0/8] irqdomain cleanups + identity mapping support Paul Mundt
2012-05-19 6:11 ` [PATCH 1/8] irqdomain: Support removal of IRQ domains Paul Mundt
2012-05-19 18:34 ` Grant Likely
2012-05-19 6:11 ` [PATCH 2/8] irqdomain: Export remaining public API symbols Paul Mundt
2012-05-19 18:34 ` Grant Likely
2012-05-19 6:11 ` [PATCH 3/8] irqdomain: Make irq_domain_simple_map() static Paul Mundt
2012-05-19 18:35 ` Grant Likely
2012-05-19 6:11 ` [PATCH 4/8] irqdomain: Simple NUMA awareness Paul Mundt
2012-05-19 18:41 ` Grant Likely
2012-05-21 4:46 ` Paul Mundt
2012-05-19 6:11 ` [PATCH 5/8] irqdomain: Kill off duplicate definitions Paul Mundt
2012-05-19 18:42 ` Grant Likely
2012-05-19 6:11 ` [PATCH 6/8] irqdomain: Support identity mapped VIRQ allocation Paul Mundt
2012-05-19 20:21 ` Grant Likely
2012-05-21 4:55 ` Paul Mundt
2012-05-19 6:11 ` [PATCH 7/8] irqdomain: trivial pr_fmt conversion Paul Mundt
2012-05-19 6:34 ` Joe Perches
2012-05-19 6:57 ` Paul Mundt
2012-05-19 18:49 ` Grant Likely [this message]
2012-05-19 6:11 ` [PATCH 8/8] irqdomain: Support insertion of existing IRQ allocations Paul Mundt
2012-05-19 18:32 ` [PATCH 0/8] irqdomain cleanups + identity mapping support Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120519184915.772FE3E03B8@localhost \
--to=grant.likely@secretlab.ca \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).