From 20dbe1d88b68778a0ef985d022c0b43086dfca07 Mon Sep 17 00:00:00 2001 From: Ishizaki Kou Date: Mon, 20 Aug 2007 22:13:27 +0900 Subject: [PATCH] --- yaml --- r: 64970 b: refs/heads/master c: a041fe2e8d0bd749b2416ef79adc416e24af7c63 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/spider_net.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 07bcde72690f..a98f89f19e13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 64251621796d5d4c0c4b6a6b6d845e4a43c63aee +refs/heads/master: a041fe2e8d0bd749b2416ef79adc416e24af7c63 diff --git a/trunk/drivers/net/spider_net.c b/trunk/drivers/net/spider_net.c index 590b12c7246c..82d837ab4db9 100644 --- a/trunk/drivers/net/spider_net.c +++ b/trunk/drivers/net/spider_net.c @@ -1441,17 +1441,14 @@ static void spider_net_handle_error_irq(struct spider_net_card *card, u32 status_reg) { u32 error_reg1, error_reg2; - u32 mask_reg1, mask_reg2; u32 i; int show_error = 1; error_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1STS); error_reg2 = spider_net_read_reg(card, SPIDER_NET_GHIINT2STS); - mask_reg1 = spider_net_read_reg(card, SPIDER_NET_GHIINT1MSK); - mask_reg2 = spider_net_read_reg(card,SPIDER_NET_GHIINT2MSK); - error_reg1 &= mask_reg1; - error_reg2 &= mask_reg2; + error_reg1 &= SPIDER_NET_INT1_MASK_VALUE; + error_reg2 &= SPIDER_NET_INT2_MASK_VALUE; /* check GHIINT0STS ************************************/ if (status_reg) @@ -1679,11 +1676,10 @@ spider_net_interrupt(int irq, void *ptr) { struct net_device *netdev = ptr; struct spider_net_card *card = netdev_priv(netdev); - u32 status_reg, mask_reg; + u32 status_reg; status_reg = spider_net_read_reg(card, SPIDER_NET_GHIINT0STS); - mask_reg = spider_net_read_reg(card, SPIDER_NET_GHIINT0MSK); - status_reg &= mask_reg; + status_reg &= SPIDER_NET_INT0_MASK_VALUE; if (!status_reg) return IRQ_NONE;