From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, bh74.an@samsung.com, ks.giri@samsung.com,
siva.kallam@samsung.com, peppe.cavallaro@st.com,
jcmvbkbc@gmail.com, Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 4/4] stmmac: remove stmmac_config
Date: Mon, 21 Apr 2014 09:09:22 -0700 [thread overview]
Message-ID: <1398096563-8786-5-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1398096563-8786-1-git-send-email-f.fainelli@gmail.com>
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>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 22 ----------------------
1 file changed, 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)
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
--
1.9.1
next prev parent reply other threads:[~2014-04-21 16:09 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 16:09 [PATCH net-next 0/4] net: ndo_set_config/ifmap cleanups Florian Fainelli
2014-04-21 16:09 ` [PATCH net-next 1/4] net: ethoc: remove ethoc_config Florian Fainelli
2014-04-21 17:43 ` Max Filippov
2014-04-21 16:09 ` [PATCH net-next 2/4] net: cpmac: remove cpmac_config Florian Fainelli
2014-04-21 16:09 ` [PATCH net-next 3/4] net: sxgbe: remove sxgbe_config Florian Fainelli
2014-04-21 16:09 ` Florian Fainelli [this message]
2014-04-21 18:59 ` [PATCH net-next 0/4] net: ndo_set_config/ifmap cleanups David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1398096563-8786-5-git-send-email-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=bh74.an@samsung.com \
--cc=davem@davemloft.net \
--cc=jcmvbkbc@gmail.com \
--cc=ks.giri@samsung.com \
--cc=netdev@vger.kernel.org \
--cc=peppe.cavallaro@st.com \
--cc=siva.kallam@samsung.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).