diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2015-10-17 22:28:56 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-17 20:56:10 -0700 |
| commit | d566e69024ac9d00ab7d0b0442ad2ba3ed4bd668 (patch) | |
| tree | e9ef6f5ca093371ec3467fbfbe96a5e4183357b5 | |
| parent | staging: octeon-ethernet: drop poll_now parameter from cvm_oct_common_open (diff) | |
| download | linux-dev-d566e69024ac9d00ab7d0b0442ad2ba3ed4bd668.tar.xz linux-dev-d566e69024ac9d00ab7d0b0442ad2ba3ed4bd668.zip | |
staging: octeon-ethernet: move cvm_oct_xaui_open()
cvm_oct_xaui_open() is trivial and does not need a dedicated file.
Move it to the main file.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/octeon/Makefile | 2 | ||||
| -rw-r--r-- | drivers/staging/octeon/ethernet-xaui.c | 31 | ||||
| -rw-r--r-- | drivers/staging/octeon/ethernet.c | 5 | ||||
| -rw-r--r-- | drivers/staging/octeon/octeon-ethernet.h | 1 |
4 files changed, 5 insertions, 34 deletions
diff --git a/drivers/staging/octeon/Makefile b/drivers/staging/octeon/Makefile index 9012dee0c348..8ca17210d917 100644 --- a/drivers/staging/octeon/Makefile +++ b/drivers/staging/octeon/Makefile @@ -19,5 +19,3 @@ octeon-ethernet-y += ethernet-rx.o octeon-ethernet-y += ethernet-sgmii.o octeon-ethernet-y += ethernet-spi.o octeon-ethernet-y += ethernet-tx.o -octeon-ethernet-y += ethernet-xaui.o - diff --git a/drivers/staging/octeon/ethernet-xaui.c b/drivers/staging/octeon/ethernet-xaui.c deleted file mode 100644 index 1b9c5f9f1e94..000000000000 --- a/drivers/staging/octeon/ethernet-xaui.c +++ /dev/null @@ -1,31 +0,0 @@ -/* - * This file is based on code from OCTEON SDK by Cavium Networks. - * - * Copyright (c) 2003-2007 Cavium Networks - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, Version 2, as - * published by the Free Software Foundation. - */ - -#include <linux/phy.h> -#include <linux/kernel.h> -#include <linux/netdevice.h> -#include <linux/ratelimit.h> -#include <net/dst.h> - -#include <asm/octeon/octeon.h> - -#include "ethernet-defines.h" -#include "octeon-ethernet.h" -#include "ethernet-util.h" -#include "ethernet-mdio.h" - -#include <asm/octeon/cvmx-helper.h> - -#include <asm/octeon/cvmx-gmxx-defs.h> - -int cvm_oct_xaui_open(struct net_device *dev) -{ - return cvm_oct_common_open(dev, cvm_oct_link_poll); -} diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 44142cffbfe5..d78fd7b5c74c 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c @@ -539,6 +539,11 @@ void cvm_oct_link_poll(struct net_device *dev) cvm_oct_note_carrier(priv, link_info); } +static int cvm_oct_xaui_open(struct net_device *dev) +{ + return cvm_oct_common_open(dev, cvm_oct_link_poll); +} + static const struct net_device_ops cvm_oct_npi_netdev_ops = { .ndo_init = cvm_oct_common_init, .ndo_uninit = cvm_oct_common_uninit, diff --git a/drivers/staging/octeon/octeon-ethernet.h b/drivers/staging/octeon/octeon-ethernet.h index 50bb42fdcaaf..fdf24d120e77 100644 --- a/drivers/staging/octeon/octeon-ethernet.h +++ b/drivers/staging/octeon/octeon-ethernet.h @@ -62,7 +62,6 @@ int cvm_oct_sgmii_open(struct net_device *dev); int cvm_oct_spi_init(struct net_device *dev); void cvm_oct_spi_uninit(struct net_device *dev); -int cvm_oct_xaui_open(struct net_device *dev); int cvm_oct_common_init(struct net_device *dev); void cvm_oct_common_uninit(struct net_device *dev); |