diff options
author | Florian Fainelli <f.fainelli@gmail.com> | 2014-04-21 12:09:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-21 14:59:13 -0400 |
commit | 3e19ca40c0aae932deaca0b8d79213de7238d666 (patch) | |
tree | ac55a5040821933bb82b66d453cc909fad8975cf /drivers/net/ethernet/samsung | |
parent | ca6bd4fa3314d8f4d306053ecd143001567fc9d5 (diff) |
net: sxgbe: remove sxgbe_config
sxgbe_config() denies changing the base address and interrupt, and
ignores all other 'struct ifmap' members, which means that it is useless
as is, so let's remove it.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/samsung')
-rw-r--r-- | drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c index 5091692ad659..137f366ec7e4 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | |||
@@ -1909,40 +1909,6 @@ static void sxgbe_set_rx_mode(struct net_device *dev) | |||
1909 | readl(ioaddr + SXGBE_HASH_LOW)); | 1909 | readl(ioaddr + SXGBE_HASH_LOW)); |
1910 | } | 1910 | } |
1911 | 1911 | ||
1912 | /** | ||
1913 | * sxgbe_config - entry point for changing configuration mode passed on by | ||
1914 | * ifconfig | ||
1915 | * @dev : pointer to the device structure | ||
1916 | * @map : pointer to the device mapping structure | ||
1917 | * Description: | ||
1918 | * This function is a driver entry point which gets called by the kernel | ||
1919 | * whenever some device configuration is changed. | ||
1920 | * Return value: | ||
1921 | * This function returns 0 if success and appropriate error otherwise. | ||
1922 | */ | ||
1923 | static int sxgbe_config(struct net_device *dev, struct ifmap *map) | ||
1924 | { | ||
1925 | struct sxgbe_priv_data *priv = netdev_priv(dev); | ||
1926 | |||
1927 | /* Can't act on a running interface */ | ||
1928 | if (dev->flags & IFF_UP) | ||
1929 | return -EBUSY; | ||
1930 | |||
1931 | /* Don't allow changing the I/O address */ | ||
1932 | if (map->base_addr != (unsigned long)priv->ioaddr) { | ||
1933 | netdev_warn(dev, "can't change I/O address\n"); | ||
1934 | return -EOPNOTSUPP; | ||
1935 | } | ||
1936 | |||
1937 | /* Don't allow changing the IRQ */ | ||
1938 | if (map->irq != priv->irq) { | ||
1939 | netdev_warn(dev, "not change IRQ number %d\n", priv->irq); | ||
1940 | return -EOPNOTSUPP; | ||
1941 | } | ||
1942 | |||
1943 | return 0; | ||
1944 | } | ||
1945 | |||
1946 | #ifdef CONFIG_NET_POLL_CONTROLLER | 1912 | #ifdef CONFIG_NET_POLL_CONTROLLER |
1947 | /** | 1913 | /** |
1948 | * sxgbe_poll_controller - entry point for polling receive by device | 1914 | * sxgbe_poll_controller - entry point for polling receive by device |
@@ -2004,7 +1970,6 @@ static const struct net_device_ops sxgbe_netdev_ops = { | |||
2004 | .ndo_set_rx_mode = sxgbe_set_rx_mode, | 1970 | .ndo_set_rx_mode = sxgbe_set_rx_mode, |
2005 | .ndo_tx_timeout = sxgbe_tx_timeout, | 1971 | .ndo_tx_timeout = sxgbe_tx_timeout, |
2006 | .ndo_do_ioctl = sxgbe_ioctl, | 1972 | .ndo_do_ioctl = sxgbe_ioctl, |
2007 | .ndo_set_config = sxgbe_config, | ||
2008 | #ifdef CONFIG_NET_POLL_CONTROLLER | 1973 | #ifdef CONFIG_NET_POLL_CONTROLLER |
2009 | .ndo_poll_controller = sxgbe_poll_controller, | 1974 | .ndo_poll_controller = sxgbe_poll_controller, |
2010 | #endif | 1975 | #endif |