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

Commit 2d7f2f90 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

stmmac: remove stmmac_config 



stmmac_config() denies changing the base address and interrupt
parameters, and ignores any other settings from the ifmap parameters,
thus making stmmac_config() useless, remove it.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e19ca40

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+0 −22
Original line number Diff line number Diff line
@@ -2214,27 +2214,6 @@ static void stmmac_tx_timeout(struct net_device *dev) 
	stmmac_tx_err(priv);

}



/* Configuration changes (passed on by ifconfig) */

static int stmmac_config(struct net_device *dev, struct ifmap *map)

{

	if (dev->flags & IFF_UP)	/* can't act on a running interface */

		return -EBUSY;



	/* Don't allow changing the I/O address */

	if (map->base_addr != dev->base_addr) {

		pr_warn("%s: can't change I/O address\n", dev->name);

		return -EOPNOTSUPP;

	}



	/* Don't allow changing the IRQ */

	if (map->irq != dev->irq) {

		pr_warn("%s: not change IRQ number %d\n", dev->name, dev->irq);

		return -EOPNOTSUPP;

	}



	return 0;

}



/**

 *  stmmac_set_rx_mode - entry point for multicast addressing

 *  @dev : pointer to the device structure
@@ -2600,7 +2579,6 @@ static const struct net_device_ops stmmac_netdev_ops = { 
	.ndo_set_rx_mode = stmmac_set_rx_mode,

	.ndo_tx_timeout = stmmac_tx_timeout,

	.ndo_do_ioctl = stmmac_ioctl,

	.ndo_set_config = stmmac_config,

#ifdef CONFIG_NET_POLL_CONTROLLER

	.ndo_poll_controller = stmmac_poll_controller,

#endif