| Message ID | 1438030523-15853-9-git-send-email-robh@kernel.org |
|---|---|
| State | New |
| Headers | show |
On 2015. 7. 28., at AM 5:55, Rob Herring <robh@kernel.org> wrote: > > set_irq_flags is ARM specific with custom flags which have genirq > equivalents. Convert drivers to use the genirq interfaces directly, so we > can kill off set_irq_flags. The translation of flags is as follows: > > IRQF_VALID -> !IRQ_NOREQUEST > IRQF_PROBE -> !IRQ_NOPROBE > IRQF_NOAUTOEN -> IRQ_NOAUTOEN > > For IRQs managed by an irqdomain, the irqdomain core code handles clearing > and setting IRQ_NOREQUEST already, so there is no need to do this in > .map() functions and we can simply remove the set_irq_flags calls. Some > users also modify IRQ_NOPROBE and this has been maintained although it > is not clear that is really needed. There appears to be a great deal of > blind copy and paste of this code. > > Signed-off-by: Rob Herring <robh@kernel.org> > Cc: Kishon Vijay Abraham I <kishon@ti.com> > Acked-by: Bjorn Helgaas <bhelgaas@google.com> > Cc: Murali Karicheri <m-karicheri2@ti.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Stephen Warren <swarren@wwwdotorg.org> > Cc: Alexandre Courbot <gnurou@gmail.com> > Cc: Jingoo Han <jingoohan1@gmail.com> Acked-by: Jingoo Han <jingoohan1@gmail.com> Best regards, Jingoo Han > Cc: Pratyush Anand <pratyush.anand@gmail.com> > Cc: Simon Horman <horms@verge.net.au> > Cc: Michal Simek <michal.simek@xilinx.com> > Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com> > Cc: linux-omap@vger.kernel.org > Cc: linux-pci@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-tegra@vger.kernel.org > Cc: linux-sh@vger.kernel.org > --- > Thomas asked that this be merged thru subsystem trees instead of arm-soc, > so please apply this to your tree. > > Rob > > drivers/pci/host/pci-dra7xx.c | 1 - > drivers/pci/host/pci-keystone-dw.c | 2 -- > drivers/pci/host/pci-tegra.c | 1 - > drivers/pci/host/pci-xgene-msi.c | 1 - > drivers/pci/host/pcie-designware.c | 1 - > drivers/pci/host/pcie-rcar.c | 1 - > drivers/pci/host/pcie-xilinx.c | 2 -- > 7 files changed, 9 deletions(-) > > diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c > index 80db09e..1a0d124 100644 > --- a/drivers/pci/host/pci-dra7xx.c > +++ b/drivers/pci/host/pci-dra7xx.c > @@ -155,7 +155,6 @@ static int dra7xx_pcie_intx_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c > index f34892e..f1d0749 100644 > --- a/drivers/pci/host/pci-keystone-dw.c > +++ b/drivers/pci/host/pci-keystone-dw.c > @@ -196,7 +196,6 @@ static int ks_dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq, > irq_set_chip_and_handler(irq, &ks_dw_pcie_msi_irq_chip, > handle_level_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > @@ -277,7 +276,6 @@ static int ks_dw_pcie_init_legacy_irq_map(struct irq_domain *d, > irq_set_chip_and_handler(irq, &ks_dw_pcie_legacy_irq_chip, > handle_level_irq); > irq_set_chip_data(irq, d->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c > index 10c0571..81df0c1 100644 > --- a/drivers/pci/host/pci-tegra.c > +++ b/drivers/pci/host/pci-tegra.c > @@ -1248,7 +1248,6 @@ static int tegra_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &tegra_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > tegra_cpuidle_pcie_irqs_in_use(); > > diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c > index 2d31d4d..8e559d1 100644 > --- a/drivers/pci/host/pci-xgene-msi.c > +++ b/drivers/pci/host/pci-xgene-msi.c > @@ -223,7 +223,6 @@ static int xgene_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, > irq_domain_set_info(domain, virq, msi_irq, > &xgene_msi_bottom_irq_chip, domain->host_data, > handle_simple_irq, NULL, NULL); > - set_irq_flags(virq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 69486be..5c6b562 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -350,7 +350,6 @@ static int dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &dw_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index c086210..7678fe0 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -664,7 +664,6 @@ static int rcar_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &rcar_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c > index f1a06a0..72015119 100644 > --- a/drivers/pci/host/pcie-xilinx.c > +++ b/drivers/pci/host/pcie-xilinx.c > @@ -338,7 +338,6 @@ static int xilinx_pcie_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &xilinx_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > @@ -377,7 +376,6 @@ static int xilinx_pcie_intx_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > -- > 2.1.0 >
On Mon, Jul 27, 2015 at 03:55:21PM -0500, Rob Herring wrote: > set_irq_flags is ARM specific with custom flags which have genirq > equivalents. Convert drivers to use the genirq interfaces directly, so we > can kill off set_irq_flags. The translation of flags is as follows: > > IRQF_VALID -> !IRQ_NOREQUEST > IRQF_PROBE -> !IRQ_NOPROBE > IRQF_NOAUTOEN -> IRQ_NOAUTOEN > > For IRQs managed by an irqdomain, the irqdomain core code handles clearing > and setting IRQ_NOREQUEST already, so there is no need to do this in > .map() functions and we can simply remove the set_irq_flags calls. Some > users also modify IRQ_NOPROBE and this has been maintained although it > is not clear that is really needed. There appears to be a great deal of > blind copy and paste of this code. > > Signed-off-by: Rob Herring <robh@kernel.org> > Cc: Kishon Vijay Abraham I <kishon@ti.com> > Acked-by: Bjorn Helgaas <bhelgaas@google.com> > Cc: Murali Karicheri <m-karicheri2@ti.com> > Cc: Thierry Reding <thierry.reding@gmail.com> > Cc: Stephen Warren <swarren@wwwdotorg.org> > Cc: Alexandre Courbot <gnurou@gmail.com> > Cc: Jingoo Han <jingoohan1@gmail.com> > Cc: Pratyush Anand <pratyush.anand@gmail.com> > Cc: Simon Horman <horms@verge.net.au> > Cc: Michal Simek <michal.simek@xilinx.com> > Cc: "Sören Brinkmann" <soren.brinkmann@xilinx.com> > Cc: linux-omap@vger.kernel.org > Cc: linux-pci@vger.kernel.org > Cc: linux-arm-kernel@lists.infradead.org > Cc: linux-tegra@vger.kernel.org > Cc: linux-sh@vger.kernel.org > --- > Thomas asked that this be merged thru subsystem trees instead of arm-soc, > so please apply this to your tree. Applied with Jingoo's ack to pci/irq for v4.3, thanks! > drivers/pci/host/pci-dra7xx.c | 1 - > drivers/pci/host/pci-keystone-dw.c | 2 -- > drivers/pci/host/pci-tegra.c | 1 - > drivers/pci/host/pci-xgene-msi.c | 1 - > drivers/pci/host/pcie-designware.c | 1 - > drivers/pci/host/pcie-rcar.c | 1 - > drivers/pci/host/pcie-xilinx.c | 2 -- > 7 files changed, 9 deletions(-) > > diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c > index 80db09e..1a0d124 100644 > --- a/drivers/pci/host/pci-dra7xx.c > +++ b/drivers/pci/host/pci-dra7xx.c > @@ -155,7 +155,6 @@ static int dra7xx_pcie_intx_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c > index f34892e..f1d0749 100644 > --- a/drivers/pci/host/pci-keystone-dw.c > +++ b/drivers/pci/host/pci-keystone-dw.c > @@ -196,7 +196,6 @@ static int ks_dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq, > irq_set_chip_and_handler(irq, &ks_dw_pcie_msi_irq_chip, > handle_level_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > @@ -277,7 +276,6 @@ static int ks_dw_pcie_init_legacy_irq_map(struct irq_domain *d, > irq_set_chip_and_handler(irq, &ks_dw_pcie_legacy_irq_chip, > handle_level_irq); > irq_set_chip_data(irq, d->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c > index 10c0571..81df0c1 100644 > --- a/drivers/pci/host/pci-tegra.c > +++ b/drivers/pci/host/pci-tegra.c > @@ -1248,7 +1248,6 @@ static int tegra_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &tegra_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > tegra_cpuidle_pcie_irqs_in_use(); > > diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c > index 2d31d4d..8e559d1 100644 > --- a/drivers/pci/host/pci-xgene-msi.c > +++ b/drivers/pci/host/pci-xgene-msi.c > @@ -223,7 +223,6 @@ static int xgene_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, > irq_domain_set_info(domain, virq, msi_irq, > &xgene_msi_bottom_irq_chip, domain->host_data, > handle_simple_irq, NULL, NULL); > - set_irq_flags(virq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c > index 69486be..5c6b562 100644 > --- a/drivers/pci/host/pcie-designware.c > +++ b/drivers/pci/host/pcie-designware.c > @@ -350,7 +350,6 @@ static int dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &dw_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c > index c086210..7678fe0 100644 > --- a/drivers/pci/host/pcie-rcar.c > +++ b/drivers/pci/host/pcie-rcar.c > @@ -664,7 +664,6 @@ static int rcar_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &rcar_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c > index f1a06a0..72015119 100644 > --- a/drivers/pci/host/pcie-xilinx.c > +++ b/drivers/pci/host/pcie-xilinx.c > @@ -338,7 +338,6 @@ static int xilinx_pcie_msi_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &xilinx_msi_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > @@ -377,7 +376,6 @@ static int xilinx_pcie_intx_map(struct irq_domain *domain, unsigned int irq, > { > irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq); > irq_set_chip_data(irq, domain->host_data); > - set_irq_flags(irq, IRQF_VALID); > > return 0; > } > -- > 2.1.0 >
diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c index 80db09e..1a0d124 100644 --- a/drivers/pci/host/pci-dra7xx.c +++ b/drivers/pci/host/pci-dra7xx.c @@ -155,7 +155,6 @@ static int dra7xx_pcie_intx_map(struct irq_domain *domain, unsigned int irq, { irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq); irq_set_chip_data(irq, domain->host_data); - set_irq_flags(irq, IRQF_VALID); return 0; } diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c index f34892e..f1d0749 100644 --- a/drivers/pci/host/pci-keystone-dw.c +++ b/drivers/pci/host/pci-keystone-dw.c @@ -196,7 +196,6 @@ static int ks_dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq, irq_set_chip_and_handler(irq, &ks_dw_pcie_msi_irq_chip, handle_level_irq); irq_set_chip_data(irq, domain->host_data); - set_irq_flags(irq, IRQF_VALID); return 0; } @@ -277,7 +276,6 @@ static int ks_dw_pcie_init_legacy_irq_map(struct irq_domain *d, irq_set_chip_and_handler(irq, &ks_dw_pcie_legacy_irq_chip, handle_level_irq); irq_set_chip_data(irq, d->host_data); - set_irq_flags(irq, IRQF_VALID); return 0; } diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 10c0571..81df0c1 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -1248,7 +1248,6 @@ static int tegra_msi_map(struct irq_domain *domain, unsigned int irq, { irq_set_chip_and_handler(irq, &tegra_msi_irq_chip, handle_simple_irq); irq_set_chip_data(irq, domain->host_data); - set_irq_flags(irq, IRQF_VALID); tegra_cpuidle_pcie_irqs_in_use(); diff --git a/drivers/pci/host/pci-xgene-msi.c b/drivers/pci/host/pci-xgene-msi.c index 2d31d4d..8e559d1 100644 --- a/drivers/pci/host/pci-xgene-msi.c +++ b/drivers/pci/host/pci-xgene-msi.c @@ -223,7 +223,6 @@ static int xgene_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, irq_domain_set_info(domain, virq, msi_irq, &xgene_msi_bottom_irq_chip, domain->host_data, handle_simple_irq, NULL, NULL); - set_irq_flags(virq, IRQF_VALID); return 0; } diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 69486be..5c6b562 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -350,7 +350,6 @@ static int dw_pcie_msi_map(struct irq_domain *domain, unsigned int irq, { irq_set_chip_and_handler(irq, &dw_msi_irq_chip, handle_simple_irq); irq_set_chip_data(irq, domain->host_data); - set_irq_flags(irq, IRQF_VALID); return 0; } diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index c086210..7678fe0 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -664,7 +664,6 @@ static int rcar_msi_map(struct irq_domain *domain, unsigned int irq, { irq_set_chip_and_handler(irq, &rcar_msi_irq_chip, handle_simple_irq); irq_set_chip_data(irq, domain->host_data); - set_irq_flags(irq, IRQF_VALID); return 0; } diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index f1a06a0..72015119 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c @@ -338,7 +338,6 @@ static int xilinx_pcie_msi_map(struct irq_domain *domain, unsigned int irq, { irq_set_chip_and_handler(irq, &xilinx_msi_irq_chip, handle_simple_irq); irq_set_chip_data(irq, domain->host_data); - set_irq_flags(irq, IRQF_VALID); return 0; } @@ -377,7 +376,6 @@ static int xilinx_pcie_intx_map(struct irq_domain *domain, unsigned int irq, { irq_set_chip_and_handler(irq, &dummy_irq_chip, handle_simple_irq); irq_set_chip_data(irq, domain->host_data); - set_irq_flags(irq, IRQF_VALID); return 0; }