use set_irq_chip_and_handler (#2408)

[openwrt-10.03/.git] / target / linux / ar7 / files / arch / mips / ar7 / vlynq.c

diff --git a/target/linux/ar7/files/arch/mips/ar7/vlynq.c b/target/linux/ar7/files/arch/mips/ar7/vlynq.c
index 76dbd55ef4477625e281e279c7547e296746e72f..4c0a86dbaf37eca2e4a95ede44c213706eebde7a 100644 (file)
--- a/target/linux/ar7/files/arch/mips/ar7/vlynq.c
+++ b/target/linux/ar7/files/arch/mips/ar7/vlynq.c
@@ -272,11 +272,13 @@ static int vlynq_setup_irq(struct vlynq_device *dev)
                        set_irq_chip_data(dev->irq_start + i, dev);
                } else if (i == dev->remote_irq) {
                        set_irq_chip_and_handler(dev->irq_start + i,
-                                                &vlynq_local_chip,
+                                                &vlynq_remote_chip,
                                                 handle_level_irq);
                        set_irq_chip_data(dev->irq_start + i, dev);
                } else {
-                       set_irq_chip(dev->irq_start + i, &vlynq_irq_chip);
+                       set_irq_chip_and_handler(dev->irq_start + i,
+                                                &vlynq_irq_chip,
+                                                handle_simple_irq);
                        set_irq_chip_data(dev->irq_start + i, dev);
                        vlynq_reg_write(dev->remote->int_device[i >> 2], 0);
                }
@@ -438,8 +440,10 @@ void vlynq_set_local_mapping(struct vlynq_device *dev, u32 tx_offset,
 
        vlynq_reg_write(dev->local->tx_offset, tx_offset);
        for (i = 0; i < 4; i++) {
-               vlynq_reg_write(dev->local->rx_mapping[i].offset, mapping[i].offset);
-               vlynq_reg_write(dev->local->rx_mapping[i].size, mapping[i].size);
+               vlynq_reg_write(dev->local->rx_mapping[i].offset,
+                                                       mapping[i].offset);
+               vlynq_reg_write(dev->local->rx_mapping[i].size,
+                                                       mapping[i].size);
        }
 }
 
@@ -450,8 +454,10 @@ void vlynq_set_remote_mapping(struct vlynq_device *dev, u32 tx_offset,
 
        vlynq_reg_write(dev->remote->tx_offset, tx_offset);
        for (i = 0; i < 4; i++) {
-               vlynq_reg_write(dev->remote->rx_mapping[i].offset, mapping[i].offset);
-               vlynq_reg_write(dev->remote->rx_mapping[i].size, mapping[i].size);
+               vlynq_reg_write(dev->remote->rx_mapping[i].offset,
+                                                       mapping[i].offset);
+               vlynq_reg_write(dev->remote->rx_mapping[i].size,
+                                                       mapping[i].size);
        }
 }
 
@@ -611,7 +617,7 @@ EXPORT_SYMBOL(vlynq_bus_type);
 #ifdef CONFIG_PCI
 extern void vlynq_pci_init(void);
 #endif
-int __init vlynq_init(void)
+static int __init vlynq_init(void)
 {
        int res = 0;
 
@@ -637,7 +643,7 @@ fail_bus:
 
 /* Add this back when vlynq-pci crap is gone */
 #if 0
-void __devexit vlynq_exit(void)
+static void __devexit vlynq_exit(void)
 {
        platform_driver_unregister(&vlynq_driver);
        bus_unregister(&vlynq_bus_type);