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>
This commit is contained in:
parent
2c265f7479
commit
d566e69024
|
@ -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
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue