All of lore.kernel.org
 help / color / mirror / Atom feed
From: Paul Burton <paul.burton@imgtec.com>
To: <linux-mips@linux-mips.org>, Ralf Baechle <ralf@linux-mips.org>,
	<trivial@kernel.org>
Cc: Paul Burton <paul.burton@imgtec.com>,
	Matt Redfearn <matt.redfearn@imgtec.com>
Subject: [PATCH 01/11] MIPS: generic: Include asm/bootinfo.h for plat_fdt_relocated()
Date: Wed, 23 Aug 2017 11:17:44 -0700	[thread overview]
Message-ID: <20170823181754.24044-2-paul.burton@imgtec.com> (raw)
In-Reply-To: <20170823181754.24044-1-paul.burton@imgtec.com>

arch/mips/generic/init.c provides an implementation of the
plat_fdt_relocated() function, but doesn't include the asm/bootinfo.h
header which declares it. This leads to a warning from sparse:

arch/mips/generic/init.c:94:13: warning: symbol 'plat_fdt_relocated' was
  not declared. Should it be static?

Fix this by including asm/bootinfo.h to get the declaration of
plat_fdt_relocated(). We also #ifdef our definition of
plat_fdt_relocated() such that it is only provided when
CONFIG_RELOCATABLE is set, matching the header & avoiding the redundant
function for non-relocatable kernels.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---

 arch/mips/generic/init.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/mips/generic/init.c b/arch/mips/generic/init.c
index 3f32b376d30e..15a7fb8e2a2e 100644
--- a/arch/mips/generic/init.c
+++ b/arch/mips/generic/init.c
@@ -16,6 +16,7 @@
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
+#include <asm/bootinfo.h>
 #include <asm/fw/fw.h>
 #include <asm/irq_cpu.h>
 #include <asm/machine.h>
@@ -88,6 +89,8 @@ void __init *plat_get_fdt(void)
 	return (void *)fdt;
 }
 
+#ifdef CONFIG_RELOCATABLE
+
 void __init plat_fdt_relocated(void *new_location)
 {
 	/*
@@ -101,6 +104,8 @@ void __init plat_fdt_relocated(void *new_location)
 		fw_arg1 = (unsigned long)new_location;
 }
 
+#endif /* CONFIG_RELOCATABLE */
+
 void __init plat_mem_setup(void)
 {
 	if (mach && mach->fixup_fdt)
-- 
2.14.1

WARNING: multiple messages have this Message-ID (diff)
From: Paul Burton <paul.burton@imgtec.com>
To: linux-mips@linux-mips.org, Ralf Baechle <ralf@linux-mips.org>,
	trivial@kernel.org
Cc: Paul Burton <paul.burton@imgtec.com>,
	Matt Redfearn <matt.redfearn@imgtec.com>
Subject: [PATCH 01/11] MIPS: generic: Include asm/bootinfo.h for plat_fdt_relocated()
Date: Wed, 23 Aug 2017 11:17:44 -0700	[thread overview]
Message-ID: <20170823181754.24044-2-paul.burton@imgtec.com> (raw)
Message-ID: <20170823181744.3nwDyMDYu7BBPLKnFrxBFSlo5UGG2g_1Y7-PaJuhxU8@z> (raw)
In-Reply-To: <20170823181754.24044-1-paul.burton@imgtec.com>

arch/mips/generic/init.c provides an implementation of the
plat_fdt_relocated() function, but doesn't include the asm/bootinfo.h
header which declares it. This leads to a warning from sparse:

arch/mips/generic/init.c:94:13: warning: symbol 'plat_fdt_relocated' was
  not declared. Should it be static?

Fix this by including asm/bootinfo.h to get the declaration of
plat_fdt_relocated(). We also #ifdef our definition of
plat_fdt_relocated() such that it is only provided when
CONFIG_RELOCATABLE is set, matching the header & avoiding the redundant
function for non-relocatable kernels.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Matt Redfearn <matt.redfearn@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---

 arch/mips/generic/init.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/mips/generic/init.c b/arch/mips/generic/init.c
index 3f32b376d30e..15a7fb8e2a2e 100644
--- a/arch/mips/generic/init.c
+++ b/arch/mips/generic/init.c
@@ -16,6 +16,7 @@
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 
+#include <asm/bootinfo.h>
 #include <asm/fw/fw.h>
 #include <asm/irq_cpu.h>
 #include <asm/machine.h>
@@ -88,6 +89,8 @@ void __init *plat_get_fdt(void)
 	return (void *)fdt;
 }
 
+#ifdef CONFIG_RELOCATABLE
+
 void __init plat_fdt_relocated(void *new_location)
 {
 	/*
@@ -101,6 +104,8 @@ void __init plat_fdt_relocated(void *new_location)
 		fw_arg1 = (unsigned long)new_location;
 }
 
+#endif /* CONFIG_RELOCATABLE */
+
 void __init plat_mem_setup(void)
 {
 	if (mach && mach->fixup_fdt)
-- 
2.14.1

  reply	other threads:[~2017-08-23 18:18 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-23 18:17 [PATCH 00/11] MIPS: Fix various sparse warnings Paul Burton
2017-08-23 18:17 ` Paul Burton
2017-08-23 18:17 ` Paul Burton [this message]
2017-08-23 18:17   ` [PATCH 01/11] MIPS: generic: Include asm/bootinfo.h for plat_fdt_relocated() Paul Burton
2017-08-23 18:17 ` [PATCH 02/11] MIPS: generic: Include asm/time.h for get_c0_*_int() Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 03/11] MIPS: Include asm/setup.h for cpu_cache_init() Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 04/11] MIPS: Include linux/cpu.h for arch_cpu_idle() Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 05/11] MIPS: Include asm/delay.h for __{,n,u}delay() Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 06/11] MIPS: Include elf-randomize.h for arch_mmap_rnd() & arch_randomize_brk() Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 07/11] MIPS: Include linux/initrd.h for free_initrd_mem() Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 08/11] MIPS: math-emu: Correct user fault_addr type Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 09/11] MIPS: Remove __invalidate_kernel_vmap_range Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 10/11] MIPS: Remove plat_timer_setup() Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-23 18:17 ` [PATCH 11/11] MIPS: Declare various variables & functions static Paul Burton
2017-08-23 18:17   ` Paul Burton
2017-08-29 10:07   ` Marcin Nowakowski
2017-08-29 10:07     ` Marcin Nowakowski
     [not found]   ` <787b1a5b-2e77-41cc-235f-6dfd882b225a@imgtec.com>
2017-08-29 16:44     ` Paul Burton
2017-08-29 16:44       ` Paul Burton
2017-08-29 16:46       ` Ralf Baechle
2017-08-25 21:20 ` [PATCH 00/11] MIPS: Fix various sparse warnings Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170823181754.24044-2-paul.burton@imgtec.com \
    --to=paul.burton@imgtec.com \
    --cc=linux-mips@linux-mips.org \
    --cc=matt.redfearn@imgtec.com \
    --cc=ralf@linux-mips.org \
    --cc=trivial@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.