aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/et131x
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-10-06 15:47:29 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:05 -0800
commit7f2bf9488db14c67778cee6b5204ecf3629e1ec2 (patch)
tree7ae07b73a7a15f5c047d6c3c20f628dcd1023230 /drivers/staging/et131x
parent4e02b4b57df1ac5e040e9b70391dfcc2929c9958 (diff)
Staging: et131x: Kill the NoPhyAccess variable
Another write once "variable" Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/et131x')
-rw-r--r--drivers/staging/et131x/et1310_tx.c3
-rw-r--r--drivers/staging/et131x/et131x_adapter.h1
-rw-r--r--drivers/staging/et131x/et131x_isr.c3
3 files changed, 1 insertions, 6 deletions
diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c
index 94f7752e2cc..b19d5069a03 100644
--- a/drivers/staging/et131x/et1310_tx.c
+++ b/drivers/staging/et131x/et1310_tx.c
@@ -368,8 +368,7 @@ int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)
* if( MP_SHOULD_FAIL_SEND( etdev ) ||
* etdev->DriverNoPhyAccess )
*/
- if (MP_SHOULD_FAIL_SEND(etdev) || etdev->DriverNoPhyAccess
- || !netif_carrier_ok(netdev)) {
+ if (MP_SHOULD_FAIL_SEND(etdev) || !netif_carrier_ok(netdev)) {
dev_kfree_skb_any(skb);
skb = NULL;
diff --git a/drivers/staging/et131x/et131x_adapter.h b/drivers/staging/et131x/et131x_adapter.h
index 1dfe06f1b1a..83ddcd503eb 100644
--- a/drivers/staging/et131x/et131x_adapter.h
+++ b/drivers/staging/et131x/et131x_adapter.h
@@ -248,7 +248,6 @@ struct et131x_adapter {
NETIF_STATUS_MEDIA_DISCONNECT,
NETIF_STATUS_MAX
} MediaState;
- u8 DriverNoPhyAccess;
/* Minimize init-time */
struct timer_list ErrorTimer;
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c
index f80189d7cb6..80fa7a36e69 100644
--- a/drivers/staging/et131x/et131x_isr.c
+++ b/drivers/staging/et131x/et131x_isr.c
@@ -109,9 +109,6 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter)
else
mask = INT_MASK_ENABLE_NO_FLOW;
- if (adapter->DriverNoPhyAccess)
- mask |= ET_INTR_PHY;
-
adapter->CachedMaskValue = mask;
writel(mask, &adapter->regs->global.int_mask);
}