diff options
author | Joe Perches <joe@perches.com> | 2010-08-23 14:20:03 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-25 18:35:43 -0400 |
commit | c061b18df0f1fe3f50fe451dbbdc9ede3c19701a (patch) | |
tree | 91508aff083ab7a93d1e7f3b6eb933059d1a2776 /drivers/net/tlan.c | |
parent | 31018e068edb9eed740bec5cf14802c3c676c9ee (diff) |
drivers/net: Remove address use from assignments of function pointers
"foo = &function" is more commonly written "foo = function"
Done with coccinelle script:
// <smpl>
@r@
identifier f;
@@
f(...) { ... }
@@
identifier r.f;
@@
- &f
+ f
// </smpl>
drivers/net/tehuti.c used a function and struct with the
same name, the function was renamed.
Compile tested x86 only.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tlan.c')
-rw-r--r-- | drivers/net/tlan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index ccee3eddc5f..0564ca05963 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c | |||
@@ -393,7 +393,7 @@ TLan_SetTimer( struct net_device *dev, u32 ticks, u32 type ) | |||
393 | spin_unlock_irqrestore(&priv->lock, flags); | 393 | spin_unlock_irqrestore(&priv->lock, flags); |
394 | return; | 394 | return; |
395 | } | 395 | } |
396 | priv->timer.function = &TLan_Timer; | 396 | priv->timer.function = TLan_Timer; |
397 | if (!in_irq()) | 397 | if (!in_irq()) |
398 | spin_unlock_irqrestore(&priv->lock, flags); | 398 | spin_unlock_irqrestore(&priv->lock, flags); |
399 | 399 | ||
@@ -1453,7 +1453,7 @@ static u32 TLan_HandleTxEOF( struct net_device *dev, u16 host_int ) | |||
1453 | TLan_DioWrite8( dev->base_addr, | 1453 | TLan_DioWrite8( dev->base_addr, |
1454 | TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); | 1454 | TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); |
1455 | if ( priv->timer.function == NULL ) { | 1455 | if ( priv->timer.function == NULL ) { |
1456 | priv->timer.function = &TLan_Timer; | 1456 | priv->timer.function = TLan_Timer; |
1457 | priv->timer.data = (unsigned long) dev; | 1457 | priv->timer.data = (unsigned long) dev; |
1458 | priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; | 1458 | priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; |
1459 | priv->timerSetAt = jiffies; | 1459 | priv->timerSetAt = jiffies; |
@@ -1601,7 +1601,7 @@ drop_and_reuse: | |||
1601 | TLan_DioWrite8( dev->base_addr, | 1601 | TLan_DioWrite8( dev->base_addr, |
1602 | TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); | 1602 | TLAN_LED_REG, TLAN_LED_LINK | TLAN_LED_ACT ); |
1603 | if ( priv->timer.function == NULL ) { | 1603 | if ( priv->timer.function == NULL ) { |
1604 | priv->timer.function = &TLan_Timer; | 1604 | priv->timer.function = TLan_Timer; |
1605 | priv->timer.data = (unsigned long) dev; | 1605 | priv->timer.data = (unsigned long) dev; |
1606 | priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; | 1606 | priv->timer.expires = jiffies + TLAN_TIMER_ACT_DELAY; |
1607 | priv->timerSetAt = jiffies; | 1607 | priv->timerSetAt = jiffies; |
@@ -1897,7 +1897,7 @@ static void TLan_Timer( unsigned long data ) | |||
1897 | TLan_DioWrite8( dev->base_addr, | 1897 | TLan_DioWrite8( dev->base_addr, |
1898 | TLAN_LED_REG, TLAN_LED_LINK ); | 1898 | TLAN_LED_REG, TLAN_LED_LINK ); |
1899 | } else { | 1899 | } else { |
1900 | priv->timer.function = &TLan_Timer; | 1900 | priv->timer.function = TLan_Timer; |
1901 | priv->timer.expires = priv->timerSetAt | 1901 | priv->timer.expires = priv->timerSetAt |
1902 | + TLAN_TIMER_ACT_DELAY; | 1902 | + TLAN_TIMER_ACT_DELAY; |
1903 | spin_unlock_irqrestore(&priv->lock, flags); | 1903 | spin_unlock_irqrestore(&priv->lock, flags); |