aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2009-11-18 03:21:04 -0500
committerDavid S. Miller <davem@davemloft.net>2009-11-18 13:48:38 -0500
commitdddcb445a33c80bca11a6566364935e681c85809 (patch)
treecf20ac36ff41adab8e8253fdd754a4eaa3344614 /drivers/net/tokenring
parent4c9ba61e9e0212fd79da9a26f7b3d47de4a56a24 (diff)
drivers/net: remove exceptional & on function name
In this file, function names are otherwise used as pointers without &. A simplified version of the semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r@ identifier f; @@ f(...) { ... } @@ identifier r.f; @@ - &f + f // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/3c359.c3
-rw-r--r--drivers/net/tokenring/olympic.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c
index 724158966ec1..cf552d1d9629 100644
--- a/drivers/net/tokenring/3c359.c
+++ b/drivers/net/tokenring/3c359.c
@@ -610,9 +610,8 @@ static int xl_open(struct net_device *dev)
610 610
611 u16 switchsettings, switchsettings_eeprom ; 611 u16 switchsettings, switchsettings_eeprom ;
612 612
613 if(request_irq(dev->irq, &xl_interrupt, IRQF_SHARED , "3c359", dev)) { 613 if (request_irq(dev->irq, xl_interrupt, IRQF_SHARED , "3c359", dev))
614 return -EAGAIN; 614 return -EAGAIN;
615 }
616 615
617 /* 616 /*
618 * Read the information from the EEPROM that we need. 617 * Read the information from the EEPROM that we need.
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index d9ec7f0bbd0a..df32025c5132 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -445,9 +445,9 @@ static int olympic_open(struct net_device *dev)
445 445
446 olympic_init(dev); 446 olympic_init(dev);
447 447
448 if(request_irq(dev->irq, &olympic_interrupt, IRQF_SHARED , "olympic", dev)) { 448 if (request_irq(dev->irq, olympic_interrupt, IRQF_SHARED , "olympic",
449 dev))
449 return -EAGAIN; 450 return -EAGAIN;
450 }
451 451
452#if OLYMPIC_DEBUG 452#if OLYMPIC_DEBUG
453 printk("BMCTL: %x\n",readl(olympic_mmio+BMCTL_SUM)); 453 printk("BMCTL: %x\n",readl(olympic_mmio+BMCTL_SUM));