From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754241AbcFPSMw (ORCPT ); Thu, 16 Jun 2016 14:12:52 -0400 Received: from mail-pf0-f182.google.com ([209.85.192.182]:33995 "EHLO mail-pf0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752626AbcFPSMu convert rfc822-to-8bit (ORCPT ); Thu, 16 Jun 2016 14:12:50 -0400 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8BIT To: Randy Dunlap , Andrew Morton From: Stephen Boyd In-Reply-To: <5762D7F3.50802@infradead.org> Cc: linux-kernel@vger.kernel.org, "Greg Kroah-Hartman" , "Stephen Rothwell" , linux-next@vger.kernel.org References: <20160616154924.1c391bfb@canb.auug.org.au> <5762BF6D.2070604@infradead.org> <5762D7F3.50802@infradead.org> Message-ID: <146610076777.8942.6261908779926362192@sboyd-linaro> User-Agent: alot/0.3.7 Subject: Re: linux-next: Tree for Jun 16 (linux/firmware.h) Date: Thu, 16 Jun 2016 11:12:47 -0700 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --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; }