Re: [Patch Part3 v4 18/38] x86: irq_remapping: Clean up unsued code
s/unsued/unused/ in subject (here and other patches).
"Clean up" is slightly ambiguous; it could mean either "make better" or
"remove." "Remove unused code" would be less ambiguous.
On Tue, Nov 25, 2014 at 03:49:42PM +0800, Jiang Liu wrote:
> Now we have converted to hierarchy irqdomain, so clean up unused code.
>
> Signed-off-by: Jiang Liu
> Tested-by: Joerg Roedel
> ---
> arch/x86/include/asm/irq_remapping.h | 23 --
> arch/x86/kernel/apic/vector.c|1 -
> drivers/iommu/irq_remapping.c| 36
> --
> 3 files changed, 60 deletions(-)
>
> diff --git a/arch/x86/include/asm/irq_remapping.h
> b/arch/x86/include/asm/irq_remapping.h
> index de8470b6f36a..6ba243126b3b 100644
> --- a/arch/x86/include/asm/irq_remapping.h
> +++ b/arch/x86/include/asm/irq_remapping.h
> @@ -26,12 +26,7 @@
> #include
> #include
>
> -struct IO_APIC_route_entry;
> -struct io_apic_irq_attr;
> -struct irq_chip;
> struct msi_msg;
> -struct pci_dev;
> -struct irq_cfg;
> struct irq_alloc_info;
>
> #ifdef CONFIG_IRQ_REMAP
> @@ -44,13 +39,7 @@ extern int irq_remapping_enable(void);
> extern void irq_remapping_disable(void);
> extern int irq_remapping_reenable(int);
> extern int irq_remap_enable_fault_handling(void);
> -extern void free_remapped_irq(int irq);
> extern void panic_if_irq_remap(const char *msg);
> -extern bool setup_remapped_irq(int irq,
> -struct irq_cfg *cfg,
> -struct irq_chip *chip);
> -
> -void irq_remap_modify_chip_defaults(struct irq_chip *chip);
>
> extern struct irq_domain *
> irq_remapping_get_ir_irq_domain( struct irq_alloc_info *info);
> @@ -77,23 +66,11 @@ static inline int irq_remapping_enable(void) { return
> -ENODEV; }
> static inline void irq_remapping_disable(void) { }
> static inline int irq_remapping_reenable(int eim) { return -ENODEV; }
> static inline int irq_remap_enable_fault_handling(void) { return -ENODEV; }
> -static inline void free_remapped_irq(int irq) { }
>
> static inline void panic_if_irq_remap(const char *msg)
> {
> }
>
> -static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip)
> -{
> -}
> -
> -static inline bool setup_remapped_irq(int irq,
> - struct irq_cfg *cfg,
> - struct irq_chip *chip)
> -{
> - return false;
> -}
> -
> static inline struct irq_domain *
> irq_remapping_get_ir_irq_domain(struct irq_alloc_info *info)
> {
> diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
> index 31dc4a871673..ca30365507a0 100644
> --- a/arch/x86/kernel/apic/vector.c
> +++ b/arch/x86/kernel/apic/vector.c
> @@ -283,7 +283,6 @@ static void x86_vector_free_irqs(struct irq_domain
> *domain,
> for (i = 0; i < nr_irqs; i++) {
> irq_data = irq_domain_get_irq_data(x86_vector_domain, virq + i);
> if (irq_data && irq_data->chip_data) {
> - free_remapped_irq(virq);
> clear_irq_vector(virq + i, irq_data->chip_data);
> free_irq_cfg(irq_data->chip_data);
> #ifdef CONFIG_X86_IO_APIC
> diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
> index d175d6911821..3c3da04da8c5 100644
> --- a/drivers/iommu/irq_remapping.c
> +++ b/drivers/iommu/irq_remapping.c
> @@ -26,11 +26,6 @@ int no_x2apic_optout;
>
> static struct irq_remap_ops *remap_ops;
>
> -static bool irq_remapped(struct irq_cfg *cfg)
> -{
> - return (cfg->remapped == 1);
> -}
> -
> static void irq_remapping_disable_io_apic(void)
> {
> /*
> @@ -160,17 +155,6 @@ int __init irq_remap_enable_fault_handling(void)
> return remap_ops->enable_faulting();
> }
>
> -void free_remapped_irq(int irq)
> -{
> - struct irq_cfg *cfg = irq_cfg(irq);
> -
> - if (!remap_ops || !remap_ops->free_irq)
> - return;
> -
> - if (irq_remapped(cfg))
> - remap_ops->free_irq(irq);
> -}
> -
> void panic_if_irq_remap(const char *msg)
> {
> if (irq_remapping_enabled)
> @@ -195,26 +179,6 @@ void irq_remapping_print_chip(struct irq_data *data,
> struct seq_file *p)
> seq_printf(p, " %s", data->chip->name);
> }
>
> -static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
> -{
> - seq_printf(p, " IR-%s", data->chip->name);
> -}
> -
> -void irq_remap_modify_chip_defaults(struct irq_chip *chip)
> -{
> - chip->irq_print_chip = ir_print_prefix;
> - chip->irq_ack = ir_ack_apic_edge;
> -}
> -
> -bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
> -{
> - if (!irq_remapped(cfg))
> - return false;
> - irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
> - irq_remap_modify_chip_defaults(chip);
> - return true;
> -}
> -
> /**
> * irq_remapping_get_ir_irq_domain - Get the irqdomain associated with the
> IOMMU
> *device
[Patch Part3 v4 18/38] x86: irq_remapping: Clean up unsued code
Now we have converted to hierarchy irqdomain, so clean up unused code.
Signed-off-by: Jiang Liu
Tested-by: Joerg Roedel
---
arch/x86/include/asm/irq_remapping.h | 23 --
arch/x86/kernel/apic/vector.c|1 -
drivers/iommu/irq_remapping.c| 36 --
3 files changed, 60 deletions(-)
diff --git a/arch/x86/include/asm/irq_remapping.h
b/arch/x86/include/asm/irq_remapping.h
index de8470b6f36a..6ba243126b3b 100644
--- a/arch/x86/include/asm/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
@@ -26,12 +26,7 @@
#include
#include
-struct IO_APIC_route_entry;
-struct io_apic_irq_attr;
-struct irq_chip;
struct msi_msg;
-struct pci_dev;
-struct irq_cfg;
struct irq_alloc_info;
#ifdef CONFIG_IRQ_REMAP
@@ -44,13 +39,7 @@ extern int irq_remapping_enable(void);
extern void irq_remapping_disable(void);
extern int irq_remapping_reenable(int);
extern int irq_remap_enable_fault_handling(void);
-extern void free_remapped_irq(int irq);
extern void panic_if_irq_remap(const char *msg);
-extern bool setup_remapped_irq(int irq,
- struct irq_cfg *cfg,
- struct irq_chip *chip);
-
-void irq_remap_modify_chip_defaults(struct irq_chip *chip);
extern struct irq_domain *
irq_remapping_get_ir_irq_domain( struct irq_alloc_info *info);
@@ -77,23 +66,11 @@ static inline int irq_remapping_enable(void) { return
-ENODEV; }
static inline void irq_remapping_disable(void) { }
static inline int irq_remapping_reenable(int eim) { return -ENODEV; }
static inline int irq_remap_enable_fault_handling(void) { return -ENODEV; }
-static inline void free_remapped_irq(int irq) { }
static inline void panic_if_irq_remap(const char *msg)
{
}
-static inline void irq_remap_modify_chip_defaults(struct irq_chip *chip)
-{
-}
-
-static inline bool setup_remapped_irq(int irq,
- struct irq_cfg *cfg,
- struct irq_chip *chip)
-{
- return false;
-}
-
static inline struct irq_domain *
irq_remapping_get_ir_irq_domain(struct irq_alloc_info *info)
{
diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 31dc4a871673..ca30365507a0 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -283,7 +283,6 @@ static void x86_vector_free_irqs(struct irq_domain *domain,
for (i = 0; i < nr_irqs; i++) {
irq_data = irq_domain_get_irq_data(x86_vector_domain, virq + i);
if (irq_data && irq_data->chip_data) {
- free_remapped_irq(virq);
clear_irq_vector(virq + i, irq_data->chip_data);
free_irq_cfg(irq_data->chip_data);
#ifdef CONFIG_X86_IO_APIC
diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index d175d6911821..3c3da04da8c5 100644
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -26,11 +26,6 @@ int no_x2apic_optout;
static struct irq_remap_ops *remap_ops;
-static bool irq_remapped(struct irq_cfg *cfg)
-{
- return (cfg->remapped == 1);
-}
-
static void irq_remapping_disable_io_apic(void)
{
/*
@@ -160,17 +155,6 @@ int __init irq_remap_enable_fault_handling(void)
return remap_ops->enable_faulting();
}
-void free_remapped_irq(int irq)
-{
- struct irq_cfg *cfg = irq_cfg(irq);
-
- if (!remap_ops || !remap_ops->free_irq)
- return;
-
- if (irq_remapped(cfg))
- remap_ops->free_irq(irq);
-}
-
void panic_if_irq_remap(const char *msg)
{
if (irq_remapping_enabled)
@@ -195,26 +179,6 @@ void irq_remapping_print_chip(struct irq_data *data,
struct seq_file *p)
seq_printf(p, " %s", data->chip->name);
}
-static void ir_print_prefix(struct irq_data *data, struct seq_file *p)
-{
- seq_printf(p, " IR-%s", data->chip->name);
-}
-
-void irq_remap_modify_chip_defaults(struct irq_chip *chip)
-{
- chip->irq_print_chip = ir_print_prefix;
- chip->irq_ack = ir_ack_apic_edge;
-}
-
-bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)
-{
- if (!irq_remapped(cfg))
- return false;
- irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
- irq_remap_modify_chip_defaults(chip);
- return true;
-}
-
/**
* irq_remapping_get_ir_irq_domain - Get the irqdomain associated with the
IOMMU
* device serving request @info
--
1.7.10.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
