diff mbox

linux-next: Tree for Jun 16 (linux/firmware.h)

Message ID 146610076777.8942.6261908779926362192@sboyd-linaro
State New
Headers show

Commit Message

Stephen Boyd June 16, 2016, 6:12 p.m. UTC 
Quoting Randy Dunlap (2016-06-16 09:46:43)
> [adding Stephen Boyd]

> 

> On 06/16/16 08:02, Randy Dunlap wrote:

> > On 06/15/16 22:49, Stephen Rothwell wrote:

> >> Hi all,

> >>

> >> Changes since 20160615:

> >>

> > 

> > on i386 and/or x86_64:

> > 

> > In file included from ../drivers/fpga/fpga-mgr.c:21:0:

> > ../include/linux/firmware.h:82:1: error: expected identifier or ( before { token

> >  {

> >  ^

> > 

> > 

> 

> See:

> 

> static inline int request_firmware_into_buf(const struct firmware **firmware_p,

>         const char *name, struct device *device, void *buf, size_t size);

> {

>         return -EINVAL;

> }

> 


Urgh sorry about that. The semicolon should go away. Andrew can you
squash this in? I tested compilation without this config enabled.

---8<---
diff mbox

Patch

diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index bdc24ee92823..b1f9f0ccb8ac 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -78,7 +78,7 @@  static inline int request_firmware_direct(const struct firmware **fw,
 }
 
 static inline int request_firmware_into_buf(const struct firmware **firmware_p,
-	const char *name, struct device *device, void *buf, size_t size);
+	const char *name, struct device *device, void *buf, size_t size)
 {
 	return -EINVAL;
 }