diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2014-04-21 12:09:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-21 14:59:21 -0400 |
commit | 2d7f2f90d54d9b64483e41d8e225d2f15e45afd8 (patch) | |
tree | 955834e876c3ac6bf4087cc151dd33a7f1f8abaa | |
parent | 3e19ca40c0aae932deaca0b8d79213de7238d666 (diff) |
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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index d940034acdd4..93cf4f63f426 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | |||
@@ -2214,27 +2214,6 @@ static void stmmac_tx_timeout(struct net_device *dev) | |||
2214 | stmmac_tx_err(priv); | 2214 | stmmac_tx_err(priv); |
2215 | } | 2215 | } |
2216 | 2216 | ||
2217 | /* Configuration changes (passed on by ifconfig) */ | ||
2218 | static int stmmac_config(struct net_device *dev, struct ifmap *map) | ||
2219 | { | ||
2220 | if (dev->flags & IFF_UP) /* can't act on a running interface */ | ||
2221 | return -EBUSY; | ||
2222 | |||
2223 | /* Don't allow changing the I/O address */ | ||
2224 | if (map->base_addr != dev->base_addr) { | ||
2225 | pr_warn("%s: can't change I/O address\n", dev->name); | ||
2226 | return -EOPNOTSUPP; | ||
2227 | } | ||
2228 | |||
2229 | /* Don't allow changing the IRQ */ | ||
2230 | if (map->irq != dev->irq) { | ||
2231 | pr_warn("%s: not change IRQ number %d\n", dev->name, dev->irq); | ||
2232 | return -EOPNOTSUPP; | ||
2233 | } | ||
2234 | |||
2235 | return 0; | ||
2236 | } | ||
2237 | |||
2238 | /** | 2217 | /** |
2239 | * stmmac_set_rx_mode - entry point for multicast addressing | 2218 | * stmmac_set_rx_mode - entry point for multicast addressing |
2240 | * @dev : pointer to the device structure | 2219 | * @dev : pointer to the device structure |
@@ -2600,7 +2579,6 @@ static const struct net_device_ops stmmac_netdev_ops = { | |||
2600 | .ndo_set_rx_mode = stmmac_set_rx_mode, | 2579 | .ndo_set_rx_mode = stmmac_set_rx_mode, |
2601 | .ndo_tx_timeout = stmmac_tx_timeout, | 2580 | .ndo_tx_timeout = stmmac_tx_timeout, |
2602 | .ndo_do_ioctl = stmmac_ioctl, | 2581 | .ndo_do_ioctl = stmmac_ioctl, |
2603 | .ndo_set_config = stmmac_config, | ||
2604 | #ifdef CONFIG_NET_POLL_CONTROLLER | 2582 | #ifdef CONFIG_NET_POLL_CONTROLLER |
2605 | .ndo_poll_controller = stmmac_poll_controller, | 2583 | .ndo_poll_controller = stmmac_poll_controller, |
2606 | #endif | 2584 | #endif |