Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dddcb445 authored by Julia Lawall's avatar Julia Lawall Committed by David S. Miller
Browse files

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4c9ba61e

drivers/net/ethoc.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static int ethoc_mdio_probe(struct net_device *dev) 
		return -ENXIO;

	}



	phy = phy_connect(dev, dev_name(&phy->dev), &ethoc_mdio_poll, 0,

	phy = phy_connect(dev, dev_name(&phy->dev), ethoc_mdio_poll, 0,

			PHY_INTERFACE_MODE_GMII);

	if (IS_ERR(phy)) {

		dev_err(&dev->dev, "could not attach to PHY\n");

drivers/net/pcmcia/fmvj18x_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int fmvj18x_probe(struct pcmcia_device *link) 
    /* Interrupt setup */

    link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING|IRQ_HANDLE_PRESENT;

    link->irq.IRQInfo1 = IRQ_LEVEL_ID;

    link->irq.Handler = &fjn_interrupt;

    link->irq.Handler = fjn_interrupt;

    link->irq.Instance = dev;



    /* General socket configuration */

drivers/net/pcmcia/nmclan_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int nmclan_probe(struct pcmcia_device *link) 
    link->io.IOAddrLines = 5;

    link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;

    link->irq.IRQInfo1 = IRQ_LEVEL_ID;

    link->irq.Handler = &mace_interrupt;

    link->irq.Handler = mace_interrupt;

    link->irq.Instance = dev;

    link->conf.Attributes = CONF_ENABLE_IRQ;

    link->conf.IntType = INT_MEMORY_AND_IO;

drivers/net/tokenring/3c359.c

+1 −2
Original line number Diff line number Diff line
@@ -610,9 +610,8 @@ static int xl_open(struct net_device *dev) 


	u16 switchsettings, switchsettings_eeprom  ;

 

	if(request_irq(dev->irq, &xl_interrupt, IRQF_SHARED , "3c359", dev)) {

	if (request_irq(dev->irq, xl_interrupt, IRQF_SHARED , "3c359", dev))

		return -EAGAIN;

	}



	/* 

	 * Read the information from the EEPROM that we need.

drivers/net/tokenring/olympic.c

+2 −2
Original line number Diff line number Diff line
@@ -445,9 +445,9 @@ static int olympic_open(struct net_device *dev) 


	olympic_init(dev);



	if(request_irq(dev->irq, &olympic_interrupt, IRQF_SHARED , "olympic", dev)) {

	if (request_irq(dev->irq, olympic_interrupt, IRQF_SHARED , "olympic",

			dev))

		return -EAGAIN;

	}



#if OLYMPIC_DEBUG

	printk("BMCTL: %x\n",readl(olympic_mmio+BMCTL_SUM));