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

Commit 8dedde6b authored Jul 12, 2015 by Bjorn Helgaas Committed by Ralf Baechle Aug 26, 2015

MIPS: CPC: Remove "weak" from mips_cpc_phys_base() and make it static



There's only one implementation of mips_cpc_phys_base(), and it's only used
within the same file, so it doesn't need to be weak, and it doesn't need an
extern declaration.

Remove the extern mips_cpc_phys_base() declaration and make it static.

[ralf@linux-mips.org: Fixed conflict.]

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: linux-mips@linux-mips.org
Cc: Andrew Bresticker <abrestic@chromium.org>
Cc: James Hogan <james.hogan@imgtec.com>
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/10681/


Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

parent 9b4685de

arch/mips/include/asm/mips-cpc.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -27,16 +27,6 @@ extern void __iomem *mips_cpc_base;
		*/
		extern phys_addr_t mips_cpc_default_phys_base(void);

		/**
		* mips_cpc_phys_base - retrieve the physical base address of the CPC
		*
		* This function returns the physical base address of the Cluster Power
		* Controller memory mapped registers, or 0 if no Cluster Power Controller
		* is present. It may be overriden by individual platforms which determine
		* this address in a different way.
		*/
		extern phys_addr_t __weak mips_cpc_phys_base(void);

		/**
		* mips_cpc_probe - probe for a Cluster Power Controller
		*

arch/mips/kernel/mips-cpc.c

+8 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,14 @@ static DEFINE_PER_CPU_ALIGNED(spinlock_t, cpc_core_lock);

		static DEFINE_PER_CPU_ALIGNED(unsigned long, cpc_core_lock_flags);

		phys_addr_t __weak mips_cpc_phys_base(void)
		/**
		* mips_cpc_phys_base - retrieve the physical base address of the CPC
		*
		* This function returns the physical base address of the Cluster Power
		* Controller memory mapped registers, or 0 if no Cluster Power Controller
		* is present.
		*/
		static phys_addr_t mips_cpc_phys_base(void)
		{
		unsigned long cpc_base;