[PATCH] MIPS: Octeon: Remove forced mappings of USB interrupts.

[PATCH] MIPS: Octeon: Remove forced mappings of USB interrupts.

[Steven J. Hill]

Get rid of unnecessary forced interrupt mappings for
the USB host controller on OCTEON II.

Signed-off-by: Steven J. Hill <steven.hill@cavium.com>
Acked-by: David Daney <david.daney@cavium.com>
Signed-off-by: Steven J. Hill <Steven.Hill@cavium.com>
---
 arch/mips/cavium-octeon/octeon-irq.c           | 12 ------------
 arch/mips/include/asm/mach-cavium-octeon/irq.h |  2 --
 2 files changed, 14 deletions(-)

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 368eb49..6ab014c 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -1542,10 +1542,6 @@ static int __init octeon_irq_init_ciu(
 			goto err;
 	}
 
-	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 0, 56);
-	if (r)
-		goto err;
-
 	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_TWSI2, 0, 59);
 	if (r)
 		goto err;
@@ -1559,10 +1555,6 @@ static int __init octeon_irq_init_ciu(
 			goto err;
 	}
 
-	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB1, 1, 17);
-	if (r)
-		goto err;
-
 	/* Enable the CIU lines */
 	set_c0_status(STATUSF_IP3 | STATUSF_IP2);
 	if (octeon_irq_use_ip4)
@@ -2077,10 +2069,6 @@ static int __init octeon_irq_init_ciu2(
 			goto err;
 	}
 
-	r = octeon_irq_force_ciu_mapping(ciu_domain, OCTEON_IRQ_USB0, 3, 44);
-	if (r)
-		goto err;
-
 	for (i = 0; i < 4; i++) {
 		r = octeon_irq_force_ciu_mapping(
 			ciu_domain, i + OCTEON_IRQ_PCI_INT0, 4, i);
diff --git a/arch/mips/include/asm/mach-cavium-octeon/irq.h b/arch/mips/include/asm/mach-cavium-octeon/irq.h
index cceae32..64b86b9 100644
--- a/arch/mips/include/asm/mach-cavium-octeon/irq.h
+++ b/arch/mips/include/asm/mach-cavium-octeon/irq.h
@@ -42,8 +42,6 @@ enum octeon_irq {
 	OCTEON_IRQ_TIMER1,
 	OCTEON_IRQ_TIMER2,
 	OCTEON_IRQ_TIMER3,
-	OCTEON_IRQ_USB0,
-	OCTEON_IRQ_USB1,
 #ifndef CONFIG_PCI_MSI
 	OCTEON_IRQ_LAST = 127
 #endif
-- 
1.9.1

Re: [PATCH] MIPS: Octeon: Remove forced mappings of USB interrupts.

[David Daney]

On 07/25/2016 01:44 PM, Steven J. Hill wrote:
> Get rid of unnecessary forced interrupt mappings for
> the USB host controller on OCTEON II.
>

What makes the mappings unnecessary, is that the corresponding symbols 
are unused.  This is essentially an exercise in dead code removal.

David.

> Signed-off-by: Steven J. Hill <steven.hill@cavium.com>
> Acked-by: David Daney <david.daney@cavium.com>
> Signed-off-by: Steven J. Hill <Steven.Hill@cavium.com>
> ---
>   arch/mips/cavium-octeon/octeon-irq.c           | 12 ------------
>   arch/mips/include/asm/mach-cavium-octeon/irq.h |  2 --
>   2 files changed, 14 deletions(-)
>
[...]

Re: [PATCH] MIPS: Octeon: Remove forced mappings of USB interrupts.

[David Daney]

On 07/25/2016 01:44 PM, Steven J. Hill wrote:
> Get rid of unnecessary forced interrupt mappings for
> the USB host controller on OCTEON II.
>

What makes the mappings unnecessary, is that the corresponding symbols 
are unused.  This is essentially an exercise in dead code removal.

David.

> Signed-off-by: Steven J. Hill <steven.hill@cavium.com>
> Acked-by: David Daney <david.daney@cavium.com>
> Signed-off-by: Steven J. Hill <Steven.Hill@cavium.com>
> ---
>   arch/mips/cavium-octeon/octeon-irq.c           | 12 ------------
>   arch/mips/include/asm/mach-cavium-octeon/irq.h |  2 --
>   2 files changed, 14 deletions(-)
>
[...]