[+cc [email protected]]
On Wed, Oct 15, 2014 at 11:06 AM, Bjorn Helgaas <[email protected]> wrote: > 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. > > Signed-off-by: Bjorn Helgaas <[email protected]> > CC: [email protected] > --- > arch/mips/include/asm/mips-cpc.h | 10 ---------- > arch/mips/kernel/mips-cpc.c | 2 +- > 2 files changed, 1 insertion(+), 11 deletions(-) > > diff --git a/arch/mips/include/asm/mips-cpc.h > b/arch/mips/include/asm/mips-cpc.h > index e139a534e0fd..8ff92cd74bde 100644 > --- a/arch/mips/include/asm/mips-cpc.h > +++ b/arch/mips/include/asm/mips-cpc.h > @@ -28,16 +28,6 @@ extern void __iomem *mips_cpc_base; > extern phys_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_t __weak mips_cpc_phys_base(void); > - > -/** > * mips_cpc_probe - probe for a Cluster Power Controller > * > * Attempt to detect the presence of a Cluster Power Controller. Returns 0 if > diff --git a/arch/mips/kernel/mips-cpc.c b/arch/mips/kernel/mips-cpc.c > index ba473608a347..36c20ae509d8 100644 > --- a/arch/mips/kernel/mips-cpc.c > +++ b/arch/mips/kernel/mips-cpc.c > @@ -21,7 +21,7 @@ static DEFINE_PER_CPU_ALIGNED(spinlock_t, cpc_core_lock); > > static DEFINE_PER_CPU_ALIGNED(unsigned long, cpc_core_lock_flags); > > -phys_t __weak mips_cpc_phys_base(void) > +static phys_t mips_cpc_phys_base(void) > { > u32 cpc_base; > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
