[irqchip:,irq/irqchip-next] irqdomain: Kill irq_domain_add_legacy_isa
diff mbox series

Message ID 162298343087.29796.2303741743539407585.tip-bot2@tip-bot2
State Accepted
Commit 405e94e9aed2a38bdcd22efe53c36c6cd53185a6
Headers show
Series
  • [irqchip:,irq/irqchip-next] irqdomain: Kill irq_domain_add_legacy_isa
Related show

Commit Message

tip-bot2 for Michal Suchanek June 6, 2021, 12:43 p.m. UTC
The following commit has been merged into the irq/irqchip-next branch of irqchip:

Commit-ID:     bf541b2ef87c162c8129333c55d2357bab122d8e
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/bf541b2ef87c162c8129333c55d2357bab122d8e
Author:        Marc Zyngier <maz@kernel.org>
AuthorDate:    Thu, 13 Sep 2018 10:42:25 +01:00
Committer:     Marc Zyngier <maz@kernel.org>
CommitterDate: Wed, 02 Jun 2021 14:34:48 +01:00

irqdomain: Kill irq_domain_add_legacy_isa

This helper doesn't have a user anymore, let's remove it.

Signed-off-by: Marc Zyngier <maz@kernel.org>
---
 Documentation/core-api/irq/irq-domain.rst |  1 -
 include/linux/irqdomain.h                 | 11 -----------
 2 files changed, 12 deletions(-)

Comments

kernel test robot June 6, 2021, 3:06 p.m. UTC | #1
Hi irqchip-bot,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on tip/irq/core]
[also build test WARNING on linux/master linus/master v5.13-rc4 next-20210604]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 006ae1970a8cde1d3e92da69b324d12880133a13
config: powerpc-allyesconfig (attached as .config)
compiler: powerpc64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659
        git checkout 7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=powerpc 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

   arch/powerpc/sysdev/i8259.c: In function 'i8259_init':
   arch/powerpc/sysdev/i8259.c:263:15: error: implicit declaration of function 'irq_domain_add_legacy_isa'; did you mean 'irq_domain_add_legacy'? [-Werror=implicit-function-declaration]
     263 |  i8259_host = irq_domain_add_legacy_isa(node, &i8259_host_ops, NULL);
         |               ^~~~~~~~~~~~~~~~~~~~~~~~~
         |               irq_domain_add_legacy
>> arch/powerpc/sysdev/i8259.c:263:13: warning: assignment to 'struct irq_domain *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
     263 |  i8259_host = irq_domain_add_legacy_isa(node, &i8259_host_ops, NULL);
         |             ^
   cc1: some warnings being treated as errors


vim +263 arch/powerpc/sysdev/i8259.c

f4d4c354bca182 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-10-25  215  
40681b95a4ef79 arch/powerpc/sysdev/i8259.c Michael Ellerman       2006-08-02  216  /**
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  217   * i8259_init - Initialize the legacy controller
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  218   * @node: device node of the legacy PIC (can be NULL, but then, it will match
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  219   *        all interrupts, so beware)
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  220   * @intack_addr: PCI interrupt acknowledge (real) address which will return
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  221   *             	 the active irq from the 8259
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  222   */
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  223  void i8259_init(struct device_node *node, unsigned long intack_addr)
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  224  {
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  225  	unsigned long flags;
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  226  
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  227  	/* initialize the controller */
47e3c9046bc884 arch/powerpc/sysdev/i8259.c Thomas Gleixner        2010-02-18  228  	raw_spin_lock_irqsave(&i8259_lock, flags);
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  229  
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  230  	/* Mask all first */
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  231  	outb(0xff, 0xA1);
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  232  	outb(0xff, 0x21);
f9bd170a87948a arch/powerpc/sysdev/i8259.c Paul Mackerras         2005-10-26  233  
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  234  	/* init master interrupt controller */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  235  	outb(0x11, 0x20); /* Start init sequence */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  236  	outb(0x00, 0x21); /* Vector base */
446957ba512714 arch/powerpc/sysdev/i8259.c Adam Buchbinder        2016-02-24  237  	outb(0x04, 0x21); /* edge triggered, Cascade (slave) on IRQ2 */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  238  	outb(0x01, 0x21); /* Select 8086 mode */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  239  
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  240  	/* init slave interrupt controller */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  241  	outb(0x11, 0xA0); /* Start init sequence */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  242  	outb(0x08, 0xA1); /* Vector base */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  243  	outb(0x02, 0xA1); /* edge triggered, Cascade (slave) on IRQ2 */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  244  	outb(0x01, 0xA1); /* Select 8086 mode */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  245  
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  246  	/* That thing is slow */
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  247  	udelay(100);
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  248  
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  249  	/* always read ISR */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  250  	outb(0x0B, 0x20);
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  251  	outb(0x0B, 0xA0);
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  252  
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  253  	/* Unmask the internal cascade */
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  254  	cached_21 &= ~(1 << 2);
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  255  
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  256  	/* Set interrupt masks */
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  257  	outb(cached_A1, 0xA1);
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  258  	outb(cached_21, 0x21);
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  259  
47e3c9046bc884 arch/powerpc/sysdev/i8259.c Thomas Gleixner        2010-02-18  260  	raw_spin_unlock_irqrestore(&i8259_lock, flags);
^1da177e4c3f41 arch/ppc/syslib/i8259.c     Linus Torvalds         2005-04-16  261  
0ebfff1491ef85 arch/powerpc/sysdev/i8259.c Benjamin Herrenschmidt 2006-07-03  262  	/* create a legacy host */
1bc04f2cf8c2a1 arch/powerpc/sysdev/i8259.c Grant Likely           2012-02-14 @263  	i8259_host = irq_domain_add_legacy_isa(node, &i8259_host_ops, NULL);

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Marc Zyngier June 6, 2021, 3:15 p.m. UTC | #2
On 2021-06-06 16:06, kernel test robot wrote:
> Hi irqchip-bot,
> 
> Thank you for the patch! Perhaps something to improve:
> 
> [auto build test WARNING on tip/irq/core]
> [also build test WARNING on linux/master linus/master v5.13-rc4 
> next-20210604]
> [If your patch is applied to the wrong git tree, kindly drop us a note.
> And when submitting patch, we suggest to use '--base' as documented in
> https://git-scm.com/docs/git-format-patch]
> 
> url:
> https://github.com/0day-ci/linux/commits/irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
> 006ae1970a8cde1d3e92da69b324d12880133a13
> config: powerpc-allyesconfig (attached as .config)
> compiler: powerpc64-linux-gcc (GCC) 9.3.0
> reproduce (this is a W=1 build):
>         wget
> https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross
> -O ~/bin/make.cross
>         chmod +x ~/bin/make.cross
>         #
> https://github.com/0day-ci/linux/commit/7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac
>         git remote add linux-review https://github.com/0day-ci/linux
>         git fetch --no-tags linux-review
> irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659
>         git checkout 7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac
>         # save the attached .config to linux build tree
>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross
> ARCH=powerpc
> 
> If you fix the issue, kindly add following tag as appropriate
> Reported-by: kernel test robot <lkp@intel.com>
> 
> All warnings (new ones prefixed by >>):
> 
>    arch/powerpc/sysdev/i8259.c: In function 'i8259_init':
>    arch/powerpc/sysdev/i8259.c:263:15: error: implicit declaration of
> function 'irq_domain_add_legacy_isa'; did you mean
> 'irq_domain_add_legacy'? [-Werror=implicit-function-declaration]
>      263 |  i8259_host = irq_domain_add_legacy_isa(node, 
> &i8259_host_ops, NULL);
>          |               ^~~~~~~~~~~~~~~~~~~~~~~~~
>          |               irq_domain_add_legacy
>>> arch/powerpc/sysdev/i8259.c:263:13: warning: assignment to 'struct 
>>> irq_domain *' from 'int' makes pointer from integer without a cast 
>>> [-Wint-conversion]
>      263 |  i8259_host = irq_domain_add_legacy_isa(node, 
> &i8259_host_ops, NULL);
>          |             ^
>    cc1: some warnings being treated as errors

This makes zero sense. At the point where this patch is applied in
the series, all instances of irq_domain_add_legacy_isa() have been
removed, except for one in the Chinese translation of the documentation:

<quote>
maz@hot-poop:~/arm-platforms$ git checkout 
bf541b2ef87c162c8129333c55d2357bab122d8e
HEAD is now at bf541b2ef87c irqdomain: Kill irq_domain_add_legacy_isa
maz@hot-poop:~/arm-platforms$ git grep irq_domain_add_legacy_isa
Documentation/translations/zh_CN/core-api/irq/irq-domain.rst:   
irq_domain_add_legacy_isa()
</quote>

Are you applying the patches out of order, by any chance?

Thanks,

         M.
kernel test robot June 6, 2021, 7:30 p.m. UTC | #3
Hi irqchip-bot,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on tip/irq/core]
[also build test ERROR on linux/master linus/master v5.13-rc4 next-20210604]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659
base:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git 006ae1970a8cde1d3e92da69b324d12880133a13
config: powerpc-allyesconfig (attached as .config)
compiler: powerpc64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659
        git checkout 7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=powerpc 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   arch/powerpc/sysdev/mpic.c: In function 'mpic_find':
>> arch/powerpc/sysdev/mpic.c:605:12: error: 'NUM_ISA_INTERRUPTS' undeclared (first use in this function)
     605 |  if (irq < NUM_ISA_INTERRUPTS)
         |            ^~~~~~~~~~~~~~~~~~
   arch/powerpc/sysdev/mpic.c:605:12: note: each undeclared identifier is reported only once for each function it appears in
--
   arch/powerpc/sysdev/i8259.c: In function 'i8259_init':
>> arch/powerpc/sysdev/i8259.c:263:15: error: implicit declaration of function 'irq_domain_add_legacy_isa'; did you mean 'irq_domain_add_legacy'? [-Werror=implicit-function-declaration]
     263 |  i8259_host = irq_domain_add_legacy_isa(node, &i8259_host_ops, NULL);
         |               ^~~~~~~~~~~~~~~~~~~~~~~~~
         |               irq_domain_add_legacy
   arch/powerpc/sysdev/i8259.c:263:13: warning: assignment to 'struct irq_domain *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
     263 |  i8259_host = irq_domain_add_legacy_isa(node, &i8259_host_ops, NULL);
         |             ^
   cc1: some warnings being treated as errors
--
   arch/powerpc/sysdev/xics/xics-common.c: In function 'xics_migrate_irqs_away':
>> arch/powerpc/sysdev/xics/xics-common.c:204:14: error: 'NUM_ISA_INTERRUPTS' undeclared (first use in this function)
     204 |   if (virq < NUM_ISA_INTERRUPTS)
         |              ^~~~~~~~~~~~~~~~~~
   arch/powerpc/sysdev/xics/xics-common.c:204:14: note: each undeclared identifier is reported only once for each function it appears in


vim +/NUM_ISA_INTERRUPTS +605 arch/powerpc/sysdev/mpic.c

14cf11af6cf608 Paul Mackerras         2005-09-26  601  
14cf11af6cf608 Paul Mackerras         2005-09-26  602  /* Find an mpic associated with a given linux interrupt */
d69a78d7daada1 Tony Breeds            2009-04-07  603  static struct mpic *mpic_find(unsigned int irq)
14cf11af6cf608 Paul Mackerras         2005-09-26  604  {
0ebfff1491ef85 Benjamin Herrenschmidt 2006-07-03 @605  	if (irq < NUM_ISA_INTERRUPTS)
14cf11af6cf608 Paul Mackerras         2005-09-26  606  		return NULL;
7df2457db83bc9 Olof Johansson         2007-01-28  607  
ec775d0e70eb6b Thomas Gleixner        2011-03-25  608  	return irq_get_chip_data(irq);
d69a78d7daada1 Tony Breeds            2009-04-07  609  }
7df2457db83bc9 Olof Johansson         2007-01-28  610  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
Chen, Rong A June 7, 2021, 6:35 a.m. UTC | #4
On 6/6/21 11:15 PM, Marc Zyngier wrote:
> On 2021-06-06 16:06, kernel test robot wrote:
>> Hi irqchip-bot,
>>
>> Thank you for the patch! Perhaps something to improve:
>>
>> [auto build test WARNING on tip/irq/core]
>> [also build test WARNING on linux/master linus/master v5.13-rc4 
>> next-20210604]
>> [If your patch is applied to the wrong git tree, kindly drop us a note.
>> And when submitting patch, we suggest to use '--base' as documented in
>> https://git-scm.com/docs/git-format-patch]
>>
>> url:
>> https://github.com/0day-ci/linux/commits/irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659 
>>
>> base: https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
>> 006ae1970a8cde1d3e92da69b324d12880133a13
>> config: powerpc-allyesconfig (attached as .config)
>> compiler: powerpc64-linux-gcc (GCC) 9.3.0
>> reproduce (this is a W=1 build):
>>         wget
>> https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross
>> -O ~/bin/make.cross
>>         chmod +x ~/bin/make.cross
>>         #
>> https://github.com/0day-ci/linux/commit/7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac 
>>
>>         git remote add linux-review https://github.com/0day-ci/linux
>>         git fetch --no-tags linux-review
>> irqchip-bot-for-Marc-Zyngier/irqdomain-Kill-irq_domain_add_legacy_isa/20210606-204659 
>>
>>         git checkout 7d6d9b0177b4ae53ccae4fb2c5cd387460def6ac
>>         # save the attached .config to linux build tree
>>         COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross
>> ARCH=powerpc
>>
>> If you fix the issue, kindly add following tag as appropriate
>> Reported-by: kernel test robot <lkp@intel.com>
>>
>> All warnings (new ones prefixed by >>):
>>
>>    arch/powerpc/sysdev/i8259.c: In function 'i8259_init':
>>    arch/powerpc/sysdev/i8259.c:263:15: error: implicit declaration of
>> function 'irq_domain_add_legacy_isa'; did you mean
>> 'irq_domain_add_legacy'? [-Werror=implicit-function-declaration]
>>      263 |  i8259_host = irq_domain_add_legacy_isa(node, 
>> &i8259_host_ops, NULL);
>>          |               ^~~~~~~~~~~~~~~~~~~~~~~~~
>>          |               irq_domain_add_legacy
>>>> arch/powerpc/sysdev/i8259.c:263:13: warning: assignment to 'struct 
>>>> irq_domain *' from 'int' makes pointer from integer without a cast 
>>>> [-Wint-conversion]
>>      263 |  i8259_host = irq_domain_add_legacy_isa(node, 
>> &i8259_host_ops, NULL);
>>          |             ^
>>    cc1: some warnings being treated as errors
>
> This makes zero sense. At the point where this patch is applied in
> the series, all instances of irq_domain_add_legacy_isa() have been
> removed, except for one in the Chinese translation of the documentation:
>
> <quote>
> maz@hot-poop:~/arm-platforms$ git checkout 
> bf541b2ef87c162c8129333c55d2357bab122d8e
> HEAD is now at bf541b2ef87c irqdomain: Kill irq_domain_add_legacy_isa
> maz@hot-poop:~/arm-platforms$ git grep irq_domain_add_legacy_isa
> Documentation/translations/zh_CN/core-api/irq/irq-domain.rst: 
> irq_domain_add_legacy_isa()
> </quote>
>
> Are you applying the patches out of order, by any chance?
>
> Thanks,
>
>         M.

Hi Marc,

Sorry for the inconvenience, we didn't identify the patch emails from 
tip-bot2,
we'll ignore these emails to avoid ineffective work.

Best Regards,
Rong Chen

Patch
diff mbox series

diff --git a/Documentation/core-api/irq/irq-domain.rst b/Documentation/core-api/irq/irq-domain.rst
index 8214e21..53283b3 100644
--- a/Documentation/core-api/irq/irq-domain.rst
+++ b/Documentation/core-api/irq/irq-domain.rst
@@ -146,7 +146,6 @@  Legacy
 
 	irq_domain_add_simple()
 	irq_domain_add_legacy()
-	irq_domain_add_legacy_isa()
 	irq_domain_create_simple()
 	irq_domain_create_legacy()
 
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h
index 62a8e3d..9f884c9 100644
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
@@ -45,9 +45,6 @@  struct cpumask;
 struct seq_file;
 struct irq_affinity_desc;
 
-/* Number of irqs reserved for a legacy isa controller */
-#define NUM_ISA_INTERRUPTS	16
-
 #define IRQ_DOMAIN_IRQ_SPEC_PARAMS 16
 
 /**
@@ -355,14 +352,6 @@  static inline struct irq_domain *irq_domain_add_nomap(struct device_node *of_nod
 {
 	return __irq_domain_add(of_node_to_fwnode(of_node), 0, max_irq, max_irq, ops, host_data);
 }
-static inline struct irq_domain *irq_domain_add_legacy_isa(
-				struct device_node *of_node,
-				const struct irq_domain_ops *ops,
-				void *host_data)
-{
-	return irq_domain_add_legacy(of_node, NUM_ISA_INTERRUPTS, 0, 0, ops,
-				     host_data);
-}
 static inline struct irq_domain *irq_domain_add_tree(struct device_node *of_node,
 					 const struct irq_domain_ops *ops,
 					 void *host_data)