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

Unverified Commit 840267e4 authored by Steven J. Hill's avatar Steven J. Hill Committed by Paul Burton
Browse files

MIPS: Octeon: Remove extern declarations. 



Get rid of extern declarations in .c functions and included
the necessary header file. Also remove unused UART declares.

Signed-off-by: default avatarSteven J. Hill <steven.hill@cavium.com>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Patchwork: https://patchwork.linux-mips.org/patch/19477/
Cc: linux-mips@linux-mips.org
parent 6312455a

arch/mips/cavium-octeon/executive/cvmx-helper-rgmii.c

+1 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@caviumnetworks.com

 * This file is part of the OCTEON SDK

 *

 * Copyright (c) 2003-2008 Cavium Networks

 * Copyright (C) 2003-2018 Cavium, Inc.

 *

 * 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
@@ -42,9 +42,6 @@ 
#include <asm/octeon/cvmx-asxx-defs.h>

#include <asm/octeon/cvmx-dbg-defs.h>



void __cvmx_interrupt_gmxx_enable(int interface);

void __cvmx_interrupt_asxx_enable(int block);



/**

 * Probe RGMII ports and determine the number present

 *

arch/mips/cavium-octeon/executive/cvmx-helper-sgmii.c

+2 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@caviumnetworks.com

 * This file is part of the OCTEON SDK

 *

 * Copyright (c) 2003-2008 Cavium Networks

 * Copyright (C) 2003-2018 Cavium, Inc.

 *

 * 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
@@ -39,10 +39,7 @@ 


#include <asm/octeon/cvmx-gmxx-defs.h>

#include <asm/octeon/cvmx-pcsx-defs.h>



void __cvmx_interrupt_gmxx_enable(int interface);

void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block);

void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index);

#include <asm/octeon/cvmx-pcsxx-defs.h>



/**

 * Perform initialization required only once for an SGMII port.

arch/mips/cavium-octeon/executive/cvmx-helper-spi.c

+3 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@caviumnetworks.com

 * This file is part of the OCTEON SDK

 *

 * Copyright (c) 2003-2008 Cavium Networks

 * Copyright (C) 2003-2018 Cavium, Inc.

 *

 * 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
@@ -25,10 +25,6 @@ 
 * Contact Cavium Networks for more information

 ***********************license end**************************************/



void __cvmx_interrupt_gmxx_enable(int interface);

void __cvmx_interrupt_spxx_int_msk_enable(int index);

void __cvmx_interrupt_stxx_int_msk_enable(int index);



/*

 * Functions for SPI initialization, configuration,

 * and monitoring.
@@ -41,6 +37,8 @@ void __cvmx_interrupt_stxx_int_msk_enable(int index); 


#include <asm/octeon/cvmx-pip-defs.h>

#include <asm/octeon/cvmx-pko-defs.h>

#include <asm/octeon/cvmx-spxx-defs.h>

#include <asm/octeon/cvmx-stxx-defs.h>



/*

 * CVMX_HELPER_SPI_TIMEOUT is used to determine how long the SPI

arch/mips/cavium-octeon/executive/cvmx-helper-xaui.c

+2 −5
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
 * Contact: support@caviumnetworks.com

 * This file is part of the OCTEON SDK

 *

 * Copyright (c) 2003-2008 Cavium Networks

 * Copyright (C) 2003-2018 Cavium, Inc.

 *

 * 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
@@ -39,12 +39,9 @@ 


#include <asm/octeon/cvmx-pko-defs.h>

#include <asm/octeon/cvmx-gmxx-defs.h>

#include <asm/octeon/cvmx-pcsx-defs.h>

#include <asm/octeon/cvmx-pcsxx-defs.h>



void __cvmx_interrupt_gmxx_enable(int interface);

void __cvmx_interrupt_pcsx_intx_en_reg_enable(int index, int block);

void __cvmx_interrupt_pcsxx_int_en_reg_enable(int index);



int __cvmx_helper_xaui_enumerate(int interface)

{

	union cvmx_gmxx_hg2_control gmx_hg2_control;

arch/mips/cavium-octeon/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -1154,11 +1154,7 @@ void __init prom_free_prom_memory(void) 
}



void __init octeon_fill_mac_addresses(void);

int octeon_prune_device_tree(void);



extern const char __appended_dtb;

extern const char __dtb_octeon_3xxx_begin;

extern const char __dtb_octeon_68xx_begin;

void __init device_tree_init(void)

{

	const void *fdt;