Skip to content

Commit 88371f8

Browse files
Jimmy Assarssonmarckleinebudde
authored andcommitted
can: kvaser_usb: Rename kvaser_usb_{ethtool,netdev}_ops_hwts to kvaser_usb_{ethtool,netdev}_ops
Now when we only got one set of ethtool_ops and netdev_ops, remove the "hwts" suffix from the struct variables kvaser_usb_{ethtool,netdev}_ops_hwts. Signed-off-by: Jimmy Assarsson <[email protected]> Reviewed-by: Vincent Mailhol <[email protected]> Link: https://lore.kernel.org/all/[email protected] Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 1a6b249 commit 88371f8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -753,15 +753,15 @@ static netdev_tx_t kvaser_usb_start_xmit(struct sk_buff *skb,
753753
return ret;
754754
}
755755

756-
static const struct net_device_ops kvaser_usb_netdev_ops_hwts = {
756+
static const struct net_device_ops kvaser_usb_netdev_ops = {
757757
.ndo_open = kvaser_usb_open,
758758
.ndo_stop = kvaser_usb_close,
759759
.ndo_eth_ioctl = can_eth_ioctl_hwts,
760760
.ndo_start_xmit = kvaser_usb_start_xmit,
761761
.ndo_change_mtu = can_change_mtu,
762762
};
763763

764-
static const struct ethtool_ops kvaser_usb_ethtool_ops_hwts = {
764+
static const struct ethtool_ops kvaser_usb_ethtool_ops = {
765765
.get_ts_info = can_ethtool_op_get_ts_info_hwts,
766766
};
767767

@@ -847,8 +847,8 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel)
847847

848848
netdev->flags |= IFF_ECHO;
849849

850-
netdev->netdev_ops = &kvaser_usb_netdev_ops_hwts;
851-
netdev->ethtool_ops = &kvaser_usb_ethtool_ops_hwts;
850+
netdev->netdev_ops = &kvaser_usb_netdev_ops;
851+
netdev->ethtool_ops = &kvaser_usb_ethtool_ops;
852852
SET_NETDEV_DEV(netdev, &dev->intf->dev);
853853
netdev->dev_id = channel;
854854

0 commit comments

Comments
 (0)