lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: et131x: Kill the NoPhyAccess variable

Browse Source 
Another write once "variable"

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox
2009-10-06 15:47:29 +01:00
committed by Greg Kroah-Hartman
parent 4e02b4b57d
commit 7f2bf9488d
3 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/et131x/et1310_tx.c
View File

@ -368,8 +368,7 @@ int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)
* if( MP_SHOULD_FAIL_SEND( etdev ) || * if( MP_SHOULD_FAIL_SEND( etdev ) ||
* etdev->DriverNoPhyAccess ) * etdev->DriverNoPhyAccess )
*/ */
if (MP_SHOULD_FAIL_SEND(etdev) || etdev->DriverNoPhyAccess if (MP_SHOULD_FAIL_SEND(etdev) || !netif_carrier_ok(netdev)) {
|| !netif_carrier_ok(netdev)) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
skb = NULL; skb = NULL;

1
drivers/staging/et131x/et131x_adapter.h
View File

@ -248,7 +248,6 @@ struct et131x_adapter {
NETIF_STATUS_MEDIA_DISCONNECT, NETIF_STATUS_MEDIA_DISCONNECT,
NETIF_STATUS_MAX NETIF_STATUS_MAX
} MediaState; } MediaState;
u8 DriverNoPhyAccess;
/* Minimize init-time */ /* Minimize init-time */
struct timer_list ErrorTimer; struct timer_list ErrorTimer;

3
drivers/staging/et131x/et131x_isr.c
View File

@ -109,9 +109,6 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter)
else else
mask = INT_MASK_ENABLE_NO_FLOW; mask = INT_MASK_ENABLE_NO_FLOW;
if (adapter->DriverNoPhyAccess)
mask |= ET_INTR_PHY;
adapter->CachedMaskValue = mask; adapter->CachedMaskValue = mask;
writel(mask, &adapter->regs->global.int_mask); writel(mask, &adapter->regs->global.int_mask);
} }