x86/irq: Remove x86_io_apic_ops.set_affinity and related interfaces

[deliverable/linux.git] / drivers / iommu / irq_remapping.c

diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
index 3eaa822c30a95f21df8a92fb0eb1355470c1dce5..7baa54a13921b8344c2f9de1280153fe86e05ae1 100644 (file)
--- a/drivers/iommu/irq_remapping.c
+++ b/drivers/iommu/irq_remapping.c
@@ -25,10 +25,6 @@ int no_x2apic_optout;
 static int disable_irq_remap;
 static struct irq_remap_ops *remap_ops;
 
-static int set_remapped_irq_affinity(struct irq_data *data,
-                                    const struct cpumask *mask,
-                                    bool force);
-
 static bool irq_remapped(struct irq_cfg *cfg)
 {
        return (cfg->remapped == 1);
@@ -61,8 +57,6 @@ static void eoi_ioapic_pin_remapped(int apic, int pin, int vector)
 static void __init irq_remapping_modify_x86_ops(void)
 {
        x86_io_apic_ops.disable         = irq_remapping_disable_io_apic;
-       x86_io_apic_ops.set_affinity    = set_remapped_irq_affinity;
-       x86_io_apic_ops.setup_entry     = setup_ioapic_remapped_entry;
        x86_io_apic_ops.eoi_ioapic_pin  = eoi_ioapic_pin_remapped;
 }
 
@@ -158,27 +152,6 @@ int __init irq_remap_enable_fault_handling(void)
        return remap_ops->enable_faulting();
 }
 
-int setup_ioapic_remapped_entry(int irq,
-                               struct IO_APIC_route_entry *entry,
-                               unsigned int destination, int vector,
-                               struct io_apic_irq_attr *attr)
-{
-       if (!remap_ops->setup_ioapic_entry)
-               return -ENODEV;
-
-       return remap_ops->setup_ioapic_entry(irq, entry, destination,
-                                            vector, attr);
-}
-
-static int set_remapped_irq_affinity(struct irq_data *data,
-                                    const struct cpumask *mask, bool force)
-{
-       if (!config_enabled(CONFIG_SMP) || !remap_ops->set_affinity)
-               return 0;
-
-       return remap_ops->set_affinity(data, mask, force);
-}
-
 void free_remapped_irq(int irq)
 {
        struct irq_cfg *cfg = irq_cfg(irq);
@@ -204,19 +177,6 @@ static void ir_ack_apic_level(struct irq_data *data)
        eoi_ioapic_irq(data->irq, irqd_cfg(data));
 }
 
-void irq_remapping_print_chip(struct irq_data *data, struct seq_file *p)
-{
-       /*
-        * Assume interrupt is remapped if the parent irqdomain isn't the
-        * vector domain, which is true for MSI, HPET and IOAPIC on x86
-        * platforms.
-        */
-       if (data->domain && data->domain->parent != arch_get_ir_parent_domain())
-               seq_printf(p, " IR-%s", data->chip->name);
-       else
-               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);
@@ -227,7 +187,6 @@ void irq_remap_modify_chip_defaults(struct irq_chip *chip)
        chip->irq_print_chip = ir_print_prefix;
        chip->irq_ack = ir_ack_apic_edge;
        chip->irq_eoi = ir_ack_apic_level;
-       chip->irq_set_affinity = x86_io_apic_ops.set_affinity;
 }
 
 bool setup_remapped_irq(int irq, struct irq_cfg *cfg, struct irq_chip *chip)