Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1237519 > unrolled thread

[PATCH 0/2] irqchip: sunxi-nmi: misc. / aesthetic improvements

Started byChen-Yu Tsai <wens@csie.org>
First post2015-10-01 17:40 +0200
Last post2015-10-02 07:30 +0200
Articles 4 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 0/2] irqchip: sunxi-nmi: misc. / aesthetic improvements Chen-Yu Tsai <wens@csie.org> - 2015-10-01 17:40 +0200
    [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT node name for identification Chen-Yu Tsai <wens@csie.org> - 2015-10-01 17:40 +0200
      Re: [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT  node name for identification Maxime Ripard <maxime.ripard@free-electrons.com> - 2015-10-01 22:50 +0200
        Re: [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT  node name for identification Chen-Yu Tsai <wens@csie.org> - 2015-10-02 07:30 +0200

#1237519 — [PATCH 0/2] irqchip: sunxi-nmi: misc. / aesthetic improvements

FromChen-Yu Tsai <wens@csie.org>
Date2015-10-01 17:40 +0200
Subject[PATCH 0/2] irqchip: sunxi-nmi: misc. / aesthetic improvements
Message-ID<qeO7D-hB-19@gated-at.bofh.it>
Hi everyone,

sunxi-nmi uses its DT node name, which is normally "interrupt-controller",
as its irqchip name. This only serves to confuse the user when one sees
"interrupt-controller" in /sys/kernel/debug/irq_domain_mapping or
/proc/interrupts. We want it to show something more specific, like
"sunxi-nmi". Also do this for the printk calls.

While at it, also switch to the new of_io_request_and_map() call, so the
IO resource is properly held, and also shows up in /proc/iomem.


Regards
ChenYu


P.S. I'm thinking about removing the "_irq_chip" suffix from the axp20x
irq chip name as well.


Chen-Yu Tsai (2):
  irqchip: sunxi-nmi: Use driver name instead of DT node name for
    identification
  irqchip: sunxi-nmi: switch to of_io_request_and_map() from of_iomap()

 drivers/irqchip/irq-sunxi-nmi.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

-- 
2.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1237523 — [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT node name for identification

FromChen-Yu Tsai <wens@csie.org>
Date2015-10-01 17:40 +0200
Subject[PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT node name for identification
Message-ID<qeO7E-hB-31@gated-at.bofh.it>
In reply to#1237519
The device tree node name is typically "interrupt-controller", which is
rather useless when used in printk messages and irq chip names for
identification purposes. Use the driver name "sunxi-nmi" instead.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/irqchip/irq-sunxi-nmi.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
index c143dd58410c..57e009917d2d 100644
--- a/drivers/irqchip/irq-sunxi-nmi.c
+++ b/drivers/irqchip/irq-sunxi-nmi.c
@@ -21,6 +21,7 @@
 #include <linux/irqchip/chained_irq.h>
 
 #define SUNXI_NMI_SRC_TYPE_MASK	0x00000003
+#define DRV_NAME "sunxi-nmi"
 
 enum {
 	SUNXI_SRC_TYPE_LEVEL_LOW = 0,
@@ -130,22 +131,22 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
 
 	domain = irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL);
 	if (!domain) {
-		pr_err("%s: Could not register interrupt domain.\n", node->name);
+		pr_err("%s: Could not register interrupt domain.\n", DRV_NAME);
 		return -ENOMEM;
 	}
 
-	ret = irq_alloc_domain_generic_chips(domain, 1, 2, node->name,
+	ret = irq_alloc_domain_generic_chips(domain, 1, 2, DRV_NAME,
 					     handle_fasteoi_irq, clr, 0,
 					     IRQ_GC_INIT_MASK_CACHE);
 	if (ret) {
 		 pr_err("%s: Could not allocate generic interrupt chip.\n",
-			 node->name);
+			 DRV_NAME);
 		 goto fail_irqd_remove;
 	}
 
 	irq = irq_of_parse_and_map(node, 0);
 	if (irq <= 0) {
-		pr_err("%s: unable to parse irq\n", node->name);
+		pr_err("%s: unable to parse irq\n", DRV_NAME);
 		ret = -EINVAL;
 		goto fail_irqd_remove;
 	}
@@ -153,7 +154,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
 	gc = irq_get_domain_generic_chip(domain, 0);
 	gc->reg_base = of_iomap(node, 0);
 	if (!gc->reg_base) {
-		pr_err("%s: unable to map resource\n", node->name);
+		pr_err("%s: unable to map resource\n", DRV_NAME);
 		ret = -ENOMEM;
 		goto fail_irqd_remove;
 	}
-- 
2.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]


#1237720 — Re: [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT node name for identification

FromMaxime Ripard <maxime.ripard@free-electrons.com>
Date2015-10-01 22:50 +0200
SubjectRe: [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT node name for identification
Message-ID<qeSXD-7fI-13@gated-at.bofh.it>
In reply to#1237523

[Multipart message — attachments visible in raw view] — view raw

Hi,

On Thu, Oct 01, 2015 at 11:33:48PM +0800, Chen-Yu Tsai wrote:
> The device tree node name is typically "interrupt-controller", which is
> rather useless when used in printk messages and irq chip names for
> identification purposes. Use the driver name "sunxi-nmi" instead.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  drivers/irqchip/irq-sunxi-nmi.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
> index c143dd58410c..57e009917d2d 100644
> --- a/drivers/irqchip/irq-sunxi-nmi.c
> +++ b/drivers/irqchip/irq-sunxi-nmi.c
> @@ -21,6 +21,7 @@
>  #include <linux/irqchip/chained_irq.h>
>  
>  #define SUNXI_NMI_SRC_TYPE_MASK	0x00000003
> +#define DRV_NAME "sunxi-nmi"
>  
>  enum {
>  	SUNXI_SRC_TYPE_LEVEL_LOW = 0,
> @@ -130,22 +131,22 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
>  
>  	domain = irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL);
>  	if (!domain) {
> -		pr_err("%s: Could not register interrupt domain.\n", node->name);
> +		pr_err("%s: Could not register interrupt domain.\n", DRV_NAME);
>  		return -ENOMEM;
>  	}
>  
> -	ret = irq_alloc_domain_generic_chips(domain, 1, 2, node->name,
> +	ret = irq_alloc_domain_generic_chips(domain, 1, 2, DRV_NAME,
>  					     handle_fasteoi_irq, clr, 0,
>  					     IRQ_GC_INIT_MASK_CACHE);
>  	if (ret) {
>  		 pr_err("%s: Could not allocate generic interrupt chip.\n",
> -			 node->name);
> +			 DRV_NAME);
>  		 goto fail_irqd_remove;
>  	}
>  
>  	irq = irq_of_parse_and_map(node, 0);
>  	if (irq <= 0) {
> -		pr_err("%s: unable to parse irq\n", node->name);
> +		pr_err("%s: unable to parse irq\n", DRV_NAME);
>  		ret = -EINVAL;
>  		goto fail_irqd_remove;
>  	}
> @@ -153,7 +154,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
>  	gc = irq_get_domain_generic_chip(domain, 0);
>  	gc->reg_base = of_iomap(node, 0);
>  	if (!gc->reg_base) {
> -		pr_err("%s: unable to map resource\n", node->name);
> +		pr_err("%s: unable to map resource\n", DRV_NAME);

All the pr_err changes can even be replaced by defining pr_fmt.

Maxime

-- 
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

[toc] | [prev] | [next] | [standalone]


#1237919 — Re: [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT node name for identification

FromChen-Yu Tsai <wens@csie.org>
Date2015-10-02 07:30 +0200
SubjectRe: [PATCH 1/2] irqchip: sunxi-nmi: Use driver name instead of DT node name for identification
Message-ID<qf14S-2jW-25@gated-at.bofh.it>
In reply to#1237720
On Fri, Oct 2, 2015 at 4:14 AM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi,
>
> On Thu, Oct 01, 2015 at 11:33:48PM +0800, Chen-Yu Tsai wrote:
>> The device tree node name is typically "interrupt-controller", which is
>> rather useless when used in printk messages and irq chip names for
>> identification purposes. Use the driver name "sunxi-nmi" instead.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> ---
>>  drivers/irqchip/irq-sunxi-nmi.c | 11 ++++++-----
>>  1 file changed, 6 insertions(+), 5 deletions(-)
>>
>> diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c
>> index c143dd58410c..57e009917d2d 100644
>> --- a/drivers/irqchip/irq-sunxi-nmi.c
>> +++ b/drivers/irqchip/irq-sunxi-nmi.c
>> @@ -21,6 +21,7 @@
>>  #include <linux/irqchip/chained_irq.h>
>>
>>  #define SUNXI_NMI_SRC_TYPE_MASK      0x00000003
>> +#define DRV_NAME "sunxi-nmi"
>>
>>  enum {
>>       SUNXI_SRC_TYPE_LEVEL_LOW = 0,
>> @@ -130,22 +131,22 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
>>
>>       domain = irq_domain_add_linear(node, 1, &irq_generic_chip_ops, NULL);
>>       if (!domain) {
>> -             pr_err("%s: Could not register interrupt domain.\n", node->name);
>> +             pr_err("%s: Could not register interrupt domain.\n", DRV_NAME);
>>               return -ENOMEM;
>>       }
>>
>> -     ret = irq_alloc_domain_generic_chips(domain, 1, 2, node->name,
>> +     ret = irq_alloc_domain_generic_chips(domain, 1, 2, DRV_NAME,
>>                                            handle_fasteoi_irq, clr, 0,
>>                                            IRQ_GC_INIT_MASK_CACHE);
>>       if (ret) {
>>                pr_err("%s: Could not allocate generic interrupt chip.\n",
>> -                      node->name);
>> +                      DRV_NAME);
>>                goto fail_irqd_remove;
>>       }
>>
>>       irq = irq_of_parse_and_map(node, 0);
>>       if (irq <= 0) {
>> -             pr_err("%s: unable to parse irq\n", node->name);
>> +             pr_err("%s: unable to parse irq\n", DRV_NAME);
>>               ret = -EINVAL;
>>               goto fail_irqd_remove;
>>       }
>> @@ -153,7 +154,7 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node,
>>       gc = irq_get_domain_generic_chip(domain, 0);
>>       gc->reg_base = of_iomap(node, 0);
>>       if (!gc->reg_base) {
>> -             pr_err("%s: unable to map resource\n", node->name);
>> +             pr_err("%s: unable to map resource\n", DRV_NAME);
>
> All the pr_err changes can even be replaced by defining pr_fmt.

Cool. Learned something today.

ChenYu
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web