From 1f25cbe85c3165f7f1a92f4bf16d0319022f4a6b Mon Sep 17 00:00:00 2001 From: Mark Einon Date: Sun, 4 Sep 2011 11:24:38 +0100 Subject: [PATCH] --- yaml --- r: 268272 b: refs/heads/master c: 9c898c7ad5c2eed0a0fc5a7ca0033315f30cb3df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/et131x/et131x_adapter.h | 2 -- trunk/drivers/staging/et131x/et131x_isr.c | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 79544dbc96c1..1b242422d837 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ddf488baf638af36c49ed71171b8375582e5bd5f +refs/heads/master: 9c898c7ad5c2eed0a0fc5a7ca0033315f30cb3df diff --git a/trunk/drivers/staging/et131x/et131x_adapter.h b/trunk/drivers/staging/et131x/et131x_adapter.h index 8c6d5f93c35d..292a7719b599 100644 --- a/trunk/drivers/staging/et131x/et131x_adapter.h +++ b/trunk/drivers/staging/et131x/et131x_adapter.h @@ -200,8 +200,6 @@ struct et131x_adapter { u16 pdown_speed; u8 pdown_duplex; - u32 cached_mask_value; - /* Xcvr status at last poll */ u16 bmsr; diff --git a/trunk/drivers/staging/et131x/et131x_isr.c b/trunk/drivers/staging/et131x/et131x_isr.c index b3290e9356e4..0747935fb3c1 100644 --- a/trunk/drivers/staging/et131x/et131x_isr.c +++ b/trunk/drivers/staging/et131x/et131x_isr.c @@ -125,7 +125,6 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter) else mask = INT_MASK_ENABLE_NO_FLOW; - adapter->cached_mask_value = mask; writel(mask, &adapter->regs->global.int_mask); } @@ -139,7 +138,6 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter) void et131x_disable_interrupts(struct et131x_adapter *adapter) { /* Disable all global interrupts */ - adapter->cached_mask_value = INT_MASK_DISABLE; writel(INT_MASK_DISABLE, &adapter->regs->global.int_mask); }