Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d566e690 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Greg Kroah-Hartman
Browse files

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: default avatarAaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2c265f74

drivers/staging/octeon/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/staging/octeon/ethernet-xaui.c

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
/*

 * 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);

}

drivers/staging/octeon/ethernet.c

+5 −0
Original line number Diff line number Diff line
@@ -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,

drivers/staging/octeon/octeon-ethernet.h

+0 −1
Original line number Diff line number Diff line
@@ -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);