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

Commit c061b18d authored by Joe Perches's avatar Joe Perches Committed by David S. Miller
Browse files

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: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31018e06

drivers/net/3c503.c

+4 −4
Original line number Diff line number Diff line
@@ -337,10 +337,10 @@ el2_probe1(struct net_device *dev, int ioaddr) 
    /* Finish setting the board's parameters. */

    ei_status.stop_page = EL2_MB1_STOP_PG;

    ei_status.word16 = wordlength;

    ei_status.reset_8390 = &el2_reset_8390;

    ei_status.get_8390_hdr = &el2_get_8390_hdr;

    ei_status.block_input = &el2_block_input;

    ei_status.block_output = &el2_block_output;

    ei_status.reset_8390 = el2_reset_8390;

    ei_status.get_8390_hdr = el2_get_8390_hdr;

    ei_status.block_input = el2_block_input;

    ei_status.block_output = el2_block_output;



    if (dev->irq == 2)

	dev->irq = 9;

drivers/net/3c515.c

+1 −1
Original line number Diff line number Diff line
@@ -734,7 +734,7 @@ static int corkscrew_open(struct net_device *dev) 
		init_timer(&vp->timer);

		vp->timer.expires = jiffies + media_tbl[dev->if_port].wait;

		vp->timer.data = (unsigned long) dev;

		vp->timer.function = &corkscrew_timer;	/* timer handler */

		vp->timer.function = corkscrew_timer;	/* timer handler */

		add_timer(&vp->timer);

	} else

		dev->if_port = vp->default_media;

drivers/net/3c59x.c

+1 −1
Original line number Diff line number Diff line
@@ -1738,7 +1738,7 @@ vortex_open(struct net_device *dev) 


	/* Use the now-standard shared IRQ implementation. */

	if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?

				&boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev))) {

				boomerang_interrupt : vortex_interrupt, IRQF_SHARED, dev->name, dev))) {

		pr_err("%s: Could not reserve IRQ %d\n", dev->name, dev->irq);

		goto err;

	}

drivers/net/atl1e/atl1e_main.c

+1 −1
Original line number Diff line number Diff line
@@ -2316,7 +2316,7 @@ static int __devinit atl1e_probe(struct pci_dev *pdev, 
	netif_napi_add(netdev, &adapter->napi, atl1e_clean, 64);



	init_timer(&adapter->phy_config_timer);

	adapter->phy_config_timer.function = &atl1e_phy_config;

	adapter->phy_config_timer.function = atl1e_phy_config;

	adapter->phy_config_timer.data = (unsigned long) adapter;



	/* get user settings */

drivers/net/atlx/atl1.c

+1 −1
Original line number Diff line number Diff line
@@ -3036,7 +3036,7 @@ static int __devinit atl1_probe(struct pci_dev *pdev, 
	netif_carrier_off(netdev);

	netif_stop_queue(netdev);



	setup_timer(&adapter->phy_config_timer, &atl1_phy_config,

	setup_timer(&adapter->phy_config_timer, atl1_phy_config,

		    (unsigned long)adapter);

	adapter->phy_timer_pending = false;