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>

diff --git a/drivers/staging/et131x/et1310_tx.c b/drivers/staging/et131x/et1310_tx.c
index 94f7752e2cccd661f6b14ad00cae23e21fbdb129..b19d5069a0338071f425e815f53735ee9c033262 100644 (file)
--- 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 1dfe06f1b1a7b83f362ad4dd16004a5daa9c876b..83ddcd503ebd110fa51457c4409ae0f4486e79d2 100644 (file)
--- 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 f80189d7cb6d5e8527666c18ab6d7c371ed44082..80fa7a36e6942e75d6fc49fa2915688f00debb16 100644 (file)
--- 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);
 }