Skip to content

Commit

Permalink
staging: et131x: remove spinlock adapter->lock
Browse files Browse the repository at this point in the history
adapter->lock is only used in et131x_multicast(), which is eventually
called by network stack function __dev_set_rx_mode(). __dev_set_rx_mode()
is always called by (net_device *)dev->addr_list_lock hold, to protect from
concurrent access. So adapter->lock is redundant.

Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Acked-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Zhao, Gang authored and Greg Kroah-Hartman committed Feb 7, 2014
1 parent a863a15 commit 0b15862
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions drivers/staging/et131x/et131x.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,8 +485,6 @@ struct et131x_adapter {
u8 eeprom_data[2];

/* Spinlocks */
spinlock_t lock;

spinlock_t tcb_send_qlock;
spinlock_t tcb_ready_qlock;
spinlock_t send_hw_lock;
Expand Down Expand Up @@ -3762,7 +3760,6 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,
adapter->netdev = netdev;

/* Initialize spinlocks here */
spin_lock_init(&adapter->lock);
spin_lock_init(&adapter->tcb_send_qlock);
spin_lock_init(&adapter->tcb_ready_qlock);
spin_lock_init(&adapter->send_hw_lock);
Expand Down Expand Up @@ -4294,12 +4291,9 @@ static void et131x_multicast(struct net_device *netdev)
{
struct et131x_adapter *adapter = netdev_priv(netdev);
int packet_filter;
unsigned long flags;
struct netdev_hw_addr *ha;
int i;

spin_lock_irqsave(&adapter->lock, flags);

/* Before we modify the platform-independent filter flags, store them
* locally. This allows us to determine if anything's changed and if
* we even need to bother the hardware
Expand Down Expand Up @@ -4351,8 +4345,6 @@ static void et131x_multicast(struct net_device *netdev)
*/
if (packet_filter != adapter->packet_filter)
et131x_set_packet_filter(adapter);

spin_unlock_irqrestore(&adapter->lock, flags);
}

/* et131x_tx - The handler to tx a packet on the device */
Expand Down

0 comments on commit 0b15862

Please sign in to comment.