Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753351AbbFZUxY (ORCPT ); Fri, 26 Jun 2015 16:53:24 -0400 Received: from mail-gw3-out.broadcom.com ([216.31.210.64]:6839 "EHLO mail-gw3-out.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753249AbbFZUxQ (ORCPT ); Fri, 26 Jun 2015 16:53:16 -0400 X-IronPort-AV: E=Sophos;i="5.13,686,1427785200"; d="scan'208";a="68377321" Message-ID: <558DBB61.6090904@broadcom.com> Date: Fri, 26 Jun 2015 13:51:45 -0700 From: Florian Fainelli User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Brian Norris , Kevin Cernekee , Florian Fainelli , "Thomas Gleixner" , Jason Cooper CC: , Gregory Fong , , Subject: Re: [PATCH] irqchip: bcm7120-l2: use of_io_request_and_map() to claim iomem References: <1434668725-24058-1-git-send-email-computersforpeace@gmail.com> In-Reply-To: <1434668725-24058-1-git-send-email-computersforpeace@gmail.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2162 Lines: 64 On 18/06/15 16:05, Brian Norris wrote: > This way, the IO resources will show up in /proc/iomem, and we can make > sure no other drivers are trying to claim these register regions. > > Signed-off-by: Brian Norris Reviewed-by: Florian Fainelli > --- > drivers/irqchip/irq-bcm7120-l2.c | 19 ++++++++++--------- > 1 file changed, 10 insertions(+), 9 deletions(-) > > diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c > index 3ba5cc780fcb..299d4de2deb5 100644 > --- a/drivers/irqchip/irq-bcm7120-l2.c > +++ b/drivers/irqchip/irq-bcm7120-l2.c > @@ -142,10 +142,10 @@ static int __init bcm7120_l2_intc_iomap_7120(struct device_node *dn, > { > int ret; > > - data->map_base[0] = of_iomap(dn, 0); > - if (!data->map_base[0]) { > + data->map_base[0] = of_io_request_and_map(dn, 0, dn->full_name); > + if (IS_ERR(data->map_base[0])) { > pr_err("unable to map registers\n"); > - return -ENOMEM; > + return PTR_ERR(data->map_base[0]); > } > > data->pair_base[0] = data->map_base[0]; > @@ -178,16 +178,17 @@ static int __init bcm7120_l2_intc_iomap_3380(struct device_node *dn, > > for (gc_idx = 0; gc_idx < MAX_WORDS; gc_idx++) { > unsigned int map_idx = gc_idx * 2; > - void __iomem *en = of_iomap(dn, map_idx + 0); > - void __iomem *stat = of_iomap(dn, map_idx + 1); > - void __iomem *base = min(en, stat); > + void __iomem *en, *stat, *base; > + > + en = of_io_request_and_map(dn, map_idx + 0, "irq-en"); > + stat = of_io_request_and_map(dn, map_idx + 1, "irq-stat"); > + if (IS_ERR(en) || IS_ERR(stat)) > + break; > > + base = min(en, stat); > data->map_base[map_idx + 0] = en; > data->map_base[map_idx + 1] = stat; > > - if (!base) > - break; > - > data->pair_base[gc_idx] = base; > data->en_offset[gc_idx] = en - base; > data->stat_offset[gc_idx] = stat - base; > -- Florian -- 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/