* [PATCH 1/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings
2020-07-26 4:15 [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings Florian Fainelli
@ 2020-07-26 4:15 ` Florian Fainelli
2020-07-26 4:15 ` [PATCH 2/2] MIPS: BCM47xx: Include bcm47xx_sprom.h Florian Fainelli
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2020-07-26 4:15 UTC (permalink / raw)
To: linux-mips
Cc: Florian Fainelli, Hauke Mehrtens, Rafał Miłecki,
Thomas Bogendoerfer,
open list:BROADCOM BCM47XX MIPS ARCHITECTURE, open list
bcm47xx_sprom.h did not include a prototype for bcm47xx_fill_sprom()
therefore add one, and make sure we do include that header to fix
-Wmissing-prototypes warnings.
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/firmware/broadcom/bcm47xx_sprom.c | 1 +
include/linux/bcm47xx_sprom.h | 10 ++++++++++
2 files changed, 11 insertions(+)
diff --git a/drivers/firmware/broadcom/bcm47xx_sprom.c b/drivers/firmware/broadcom/bcm47xx_sprom.c
index 4787f86c8ac1..14fbcd11657c 100644
--- a/drivers/firmware/broadcom/bcm47xx_sprom.c
+++ b/drivers/firmware/broadcom/bcm47xx_sprom.c
@@ -27,6 +27,7 @@
*/
#include <linux/bcm47xx_nvram.h>
+#include <linux/bcm47xx_sprom.h>
#include <linux/bcma/bcma.h>
#include <linux/etherdevice.h>
#include <linux/if_ether.h>
diff --git a/include/linux/bcm47xx_sprom.h b/include/linux/bcm47xx_sprom.h
index b0f4424f34fc..f8254fd53e15 100644
--- a/include/linux/bcm47xx_sprom.h
+++ b/include/linux/bcm47xx_sprom.h
@@ -9,9 +9,19 @@
#include <linux/kernel.h>
#include <linux/vmalloc.h>
+struct ssb_sprom;
+
#ifdef CONFIG_BCM47XX_SPROM
+void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
+ bool fallback);
int bcm47xx_sprom_register_fallbacks(void);
#else
+static inline void bcm47xx_fill_sprom(struct ssb_sprom *sprom,
+ const char *prefix,
+ bool fallback)
+{
+}
+
static inline int bcm47xx_sprom_register_fallbacks(void)
{
return -ENOTSUPP;
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] MIPS: BCM47xx: Include bcm47xx_sprom.h
2020-07-26 4:15 [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings Florian Fainelli
2020-07-26 4:15 ` [PATCH 1/2] " Florian Fainelli
@ 2020-07-26 4:15 ` Florian Fainelli
2020-08-07 18:37 ` [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings Florian Fainelli
2020-08-17 11:53 ` Thomas Bogendoerfer
3 siblings, 0 replies; 6+ messages in thread
From: Florian Fainelli @ 2020-07-26 4:15 UTC (permalink / raw)
To: linux-mips
Cc: Florian Fainelli, Hauke Mehrtens, Rafał Miłecki,
Thomas Bogendoerfer,
open list:BROADCOM BCM47XX MIPS ARCHITECTURE, open list
Now that bcm47xx_sprom.h contains a prototype for bcm47xx_fill_sprom,
include that header file directly from bcm47xx.h.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
index d7f1ef246d5c..93817bfb7fb2 100644
--- a/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
+++ b/arch/mips/include/asm/mach-bcm47xx/bcm47xx.h
@@ -10,6 +10,7 @@
#include <linux/bcma/bcma.h>
#include <linux/bcma/bcma_soc.h>
#include <linux/bcm47xx_nvram.h>
+#include <linux/bcm47xx_sprom.h>
enum bcm47xx_bus_type {
#ifdef CONFIG_BCM47XX_SSB
@@ -32,9 +33,6 @@ union bcm47xx_bus {
extern union bcm47xx_bus bcm47xx_bus;
extern enum bcm47xx_bus_type bcm47xx_bus_type;
-void bcm47xx_fill_sprom(struct ssb_sprom *sprom, const char *prefix,
- bool fallback);
-
void bcm47xx_set_system_type(u16 chip_id);
#endif /* __ASM_BCM47XX_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings
2020-07-26 4:15 [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings Florian Fainelli
2020-07-26 4:15 ` [PATCH 1/2] " Florian Fainelli
2020-07-26 4:15 ` [PATCH 2/2] MIPS: BCM47xx: Include bcm47xx_sprom.h Florian Fainelli
@ 2020-08-07 18:37 ` Florian Fainelli
2020-08-12 14:52 ` Thomas Bogendoerfer
2020-08-17 11:53 ` Thomas Bogendoerfer
3 siblings, 1 reply; 6+ messages in thread
From: Florian Fainelli @ 2020-08-07 18:37 UTC (permalink / raw)
To: linux-mips, Thomas Bogendoerfer
Cc: Hauke Mehrtens, Rafał Miłecki,
open list:BROADCOM BCM47XX MIPS ARCHITECTURE, open list
On 7/25/2020 9:15 PM, Florian Fainelli wrote:
> Hi Thomas,
>
> This patch series fixes W=1 -Wmissing-prototypes warnings for the
> bcm47xx_sprom.c firmware file.
Thomas, can you apply these patches if you are fine with them? Thanks
>
> Thanks!
>
> Florian Fainelli (2):
> firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings
> MIPS: BCM47xx: Include bcm47xx_sprom.h
>
> arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +---
> drivers/firmware/broadcom/bcm47xx_sprom.c | 1 +
> include/linux/bcm47xx_sprom.h | 10 ++++++++++
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
--
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings
2020-08-07 18:37 ` [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings Florian Fainelli
@ 2020-08-12 14:52 ` Thomas Bogendoerfer
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-12 14:52 UTC (permalink / raw)
To: Florian Fainelli
Cc: linux-mips, Hauke Mehrtens, Rafał Miłecki,
open list:BROADCOM BCM47XX MIPS ARCHITECTURE, open list
On Fri, Aug 07, 2020 at 11:37:43AM -0700, Florian Fainelli wrote:
>
>
> On 7/25/2020 9:15 PM, Florian Fainelli wrote:
> > Hi Thomas,
> >
> > This patch series fixes W=1 -Wmissing-prototypes warnings for the
> > bcm47xx_sprom.c firmware file.
>
> Thomas, can you apply these patches if you are fine with them? Thanks
I was unsure about the maintainer status of drivers/firmware/broadcom, but
I'll apply it to mips-next after merge window.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings
2020-07-26 4:15 [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings Florian Fainelli
` (2 preceding siblings ...)
2020-08-07 18:37 ` [PATCH 0/2] firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings Florian Fainelli
@ 2020-08-17 11:53 ` Thomas Bogendoerfer
3 siblings, 0 replies; 6+ messages in thread
From: Thomas Bogendoerfer @ 2020-08-17 11:53 UTC (permalink / raw)
To: Florian Fainelli
Cc: linux-mips, Hauke Mehrtens, Rafał Miłecki,
open list:BROADCOM BCM47XX MIPS ARCHITECTURE, open list
On Sat, Jul 25, 2020 at 09:15:19PM -0700, Florian Fainelli wrote:
> Hi Thomas,
>
> This patch series fixes W=1 -Wmissing-prototypes warnings for the
> bcm47xx_sprom.c firmware file.
>
> Thanks!
>
> Florian Fainelli (2):
> firmware: bcm47xx_sprom: Fix -Wmissing-prototypes warnings
> MIPS: BCM47xx: Include bcm47xx_sprom.h
>
> arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 +---
> drivers/firmware/broadcom/bcm47xx_sprom.c | 1 +
> include/linux/bcm47xx_sprom.h | 10 ++++++++++
> 3 files changed, 12 insertions(+), 3 deletions(-)
series applied to mips-next.
Thomas.
--
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea. [ RFC1925, 2.3 ]
^ permalink raw reply [flat|nested] 6+ messages in thread