Merge branch 'upstream' of git://git.infradead.org/~dedekind/ubi-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / ibm_emac / ibm_emac_mal.c

diff --git a/drivers/net/ibm_emac/ibm_emac_mal.c b/drivers/net/ibm_emac/ibm_emac_mal.c
index af50e7b2e0d7f998bcb9cf5f42d728366bc384e8..cabd9846a5ee55784845d4644d1a5027e1ac177a 100644 (file)
--- a/drivers/net/ibm_emac/ibm_emac_mal.c
+++ b/drivers/net/ibm_emac/ibm_emac_mal.c
@@ -59,8 +59,7 @@ int __init mal_register_commac(struct ibm_ocp_mal *mal,
        return 0;
 }
 
-void __exit mal_unregister_commac(struct ibm_ocp_mal *mal,
-                                 struct mal_commac *commac)
+void mal_unregister_commac(struct ibm_ocp_mal *mal, struct mal_commac *commac)
 {
        unsigned long flags;
        local_irq_save(flags);
@@ -168,7 +167,7 @@ static inline void mal_disable_eob_irq(struct ibm_ocp_mal *mal)
        MAL_DBG2("%d: disable_irq" NL, mal->def->index);
 }
 
-static irqreturn_t mal_serr(int irq, void *dev_instance, struct pt_regs *regs)
+static irqreturn_t mal_serr(int irq, void *dev_instance)
 {
        struct ibm_ocp_mal *mal = dev_instance;
        u32 esr = get_mal_dcrn(mal, MAL_ESR);
@@ -216,7 +215,7 @@ static inline void mal_schedule_poll(struct ibm_ocp_mal *mal)
                MAL_DBG2("%d: already in poll" NL, mal->def->index);
 }
 
-static irqreturn_t mal_txeob(int irq, void *dev_instance, struct pt_regs *regs)
+static irqreturn_t mal_txeob(int irq, void *dev_instance)
 {
        struct ibm_ocp_mal *mal = dev_instance;
        u32 r = get_mal_dcrn(mal, MAL_TXEOBISR);
@@ -226,7 +225,7 @@ static irqreturn_t mal_txeob(int irq, void *dev_instance, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t mal_rxeob(int irq, void *dev_instance, struct pt_regs *regs)
+static irqreturn_t mal_rxeob(int irq, void *dev_instance)
 {
        struct ibm_ocp_mal *mal = dev_instance;
        u32 r = get_mal_dcrn(mal, MAL_RXEOBISR);
@@ -236,7 +235,7 @@ static irqreturn_t mal_rxeob(int irq, void *dev_instance, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t mal_txde(int irq, void *dev_instance, struct pt_regs *regs)
+static irqreturn_t mal_txde(int irq, void *dev_instance)
 {
        struct ibm_ocp_mal *mal = dev_instance;
        u32 deir = get_mal_dcrn(mal, MAL_TXDEIR);
@@ -252,7 +251,7 @@ static irqreturn_t mal_txde(int irq, void *dev_instance, struct pt_regs *regs)
        return IRQ_HANDLED;
 }
 
-static irqreturn_t mal_rxde(int irq, void *dev_instance, struct pt_regs *regs)
+static irqreturn_t mal_rxde(int irq, void *dev_instance)
 {
        struct ibm_ocp_mal *mal = dev_instance;
        struct list_head *l;