diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2010-08-17 05:31:15 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-17 05:31:15 -0400 |
commit | 01414802054c382072b6cb9a1bdc6e243c74b2d5 (patch) | |
tree | f09b05eb9fff16a69d83ec28653992d1bae8d74c /drivers/net/usb/hso.c | |
parent | bb8a10bbd10a45db0eb45bac520489bdbc0917ef (diff) |
ethtool: Provide a default implementation of ethtool_ops::get_drvinfo
The driver name and bus address for a net_device can normally be found
through the driver model now. Instead of requiring drivers to provide
this information redundantly through the ethtool_ops::get_drvinfo
operation, use the driver model to do so if the driver does not define
the operation. Since ETHTOOL_GDRVINFO no longer requires the driver
to implement any operations, do not require net_device::ethtool_ops to
be set either.
Remove implementations of get_drvinfo and ethtool_ops that provide
only this information.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb/hso.c')
-rw-r--r-- | drivers/net/usb/hso.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index 6efca66b8766..4f123f869bdc 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c | |||
@@ -843,16 +843,7 @@ static netdev_tx_t hso_net_start_xmit(struct sk_buff *skb, | |||
843 | return NETDEV_TX_OK; | 843 | return NETDEV_TX_OK; |
844 | } | 844 | } |
845 | 845 | ||
846 | static void hso_get_drvinfo(struct net_device *net, struct ethtool_drvinfo *info) | ||
847 | { | ||
848 | struct hso_net *odev = netdev_priv(net); | ||
849 | |||
850 | strncpy(info->driver, driver_name, ETHTOOL_BUSINFO_LEN); | ||
851 | usb_make_path(odev->parent->usb, info->bus_info, sizeof info->bus_info); | ||
852 | } | ||
853 | |||
854 | static const struct ethtool_ops ops = { | 846 | static const struct ethtool_ops ops = { |
855 | .get_drvinfo = hso_get_drvinfo, | ||
856 | .get_link = ethtool_op_get_link | 847 | .get_link = ethtool_op_get_link |
857 | }; | 848 | }; |
858 | 849 | ||