diff options
| author | Martin Habets <habetsm.xilinx@gmail.com> | 2022-05-09 16:32:33 +0100 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-10 15:38:15 -0700 |
| commit | 95e96f7788d0ccea7e70322ce75b873d43124dc9 (patch) | |
| tree | 081297bde38bf64c8922ba14f70f074d167697bc /drivers/net/ethernet/sfc/siena/efx.c | |
| parent | 7f9e4b2a61ba1ffda9ebcf79dc0374e01051e86a (diff) | |
| download | lwn-95e96f7788d0ccea7e70322ce75b873d43124dc9.tar.gz lwn-95e96f7788d0ccea7e70322ce75b873d43124dc9.zip | |
sfc/siena: Rename peripheral functions to avoid conflicts with sfc
For siena use efx_siena_ as the function prefix.
This patch covers selftest.h, ptp.h, net_driver.h and ethtool_common.h.
efx_ethtool_fill_self_tests() can become static.
Some functions in ptp.c can also become static.
Rename loopback_mode in net_driver.h.
Signed-off-by: Martin Habets <habetsm.xilinx@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/sfc/siena/efx.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/siena/efx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/siena/efx.c b/drivers/net/ethernet/sfc/siena/efx.c index d94e2438ae3a..3b79c39300a4 100644 --- a/drivers/net/ethernet/sfc/siena/efx.c +++ b/drivers/net/ethernet/sfc/siena/efx.c @@ -494,9 +494,9 @@ static int efx_ioctl(struct net_device *net_dev, struct ifreq *ifr, int cmd) struct mii_ioctl_data *data = if_mii(ifr); if (cmd == SIOCSHWTSTAMP) - return efx_ptp_set_ts_config(efx, ifr); + return efx_siena_ptp_set_ts_config(efx, ifr); if (cmd == SIOCGHWTSTAMP) - return efx_ptp_get_ts_config(efx, ifr); + return efx_siena_ptp_get_ts_config(efx, ifr); /* Convert phy_id from older PRTAD/DEVAD format */ if ((cmd == SIOCGMIIREG || cmd == SIOCSMIIREG) && @@ -536,7 +536,7 @@ static int efx_net_open(struct net_device *net_dev) efx_siena_start_all(efx); if (efx->state == STATE_DISABLED || efx->reset_pending) netif_device_detach(efx->net_dev); - efx_selftest_async_start(efx); + efx_siena_selftest_async_start(efx); return 0; } |