From patchwork Thu Jun 16 18:12:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 70207 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp391921qgy; Thu, 16 Jun 2016 11:12:54 -0700 (PDT) X-Received: by 10.98.23.20 with SMTP id 20mr6696354pfx.96.1466100774668; Thu, 16 Jun 2016 11:12:54 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i68si7134891pfj.25.2016.06.16.11.12.54; Thu, 16 Jun 2016 11:12:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754255AbcFPSMw (ORCPT + 30 others); 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 Received: by mail-pf0-f182.google.com with SMTP id h14so7041465pfe.1 for ; Thu, 16 Jun 2016 11:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:content-transfer-encoding:to:from:in-reply-to:cc :references:message-id:user-agent:subject:date; bh=BOFwt/Y53ClWBHDmWIYBm4PZ8r4t5grNHhbRRCoErrA=; b=YmllxVIpjn4XGS81vSwNBI+KX0Z2DQ9J4Fy9Z7sDIsIHLcKqO6FVaAu8Kf82OeYDXI u0q8sJlhPs9rpC4sRwcw7sYpEQsSRZsLb34qBgbamIrBMSIyGLqD+JvHo6x6UirPsZjb ZY/WwwTcDYek2IbYJIYPWvXAqulUpe4B80AJ0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:content-transfer-encoding:to:from :in-reply-to:cc:references:message-id:user-agent:subject:date; bh=BOFwt/Y53ClWBHDmWIYBm4PZ8r4t5grNHhbRRCoErrA=; b=BGxhfPVjMnJjBmXlQpNUO3o57PhM982WrQG0XIW7kVkbNLQPqrt9LonqzZoF4OWKRk P254Vm0Ag3BKvPmVirFWKIDcfatIug1nEPm8OB0//C7/ApZbkMOR+fa5YNCPXe7QYZr3 SkDUNqFQW6QLGT1Xmsqp0fueRk2TymjAmJC8kybyUWoXYFGFHQyvGpuKoWMDyTVqCclX YMEk8Ro+mY69vIPGYy2RFhJm71vxPHojDpOoNwd4aoOGI7CrndK+q7M2rVnYQY8Q56DZ 9L5UXDI/53voqBa5j32NrnlEdSvBSHsLDCVtb1+zF7Ws77Kas0K+9UxpsNjQarTxbEAz xvRQ== X-Gm-Message-State: ALyK8tLnnT/S46x82U9NNVoxcu7gIkq3hseUDvrOyEl3TJc1t/mj2JcewiJtb/Z/neM+diym X-Received: by 10.98.12.22 with SMTP id u22mr1822398pfi.80.1466100769630; Thu, 16 Jun 2016 11:12:49 -0700 (PDT) Received: from localhost (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id 75sm31999691pfy.32.2016.06.16.11.12.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jun 2016 11:12:49 -0700 (PDT) MIME-Version: 1.0 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 Precedence: bulk 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; }