From patchwork Mon Jun 16 21:11:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Warren X-Patchwork-Id: 4362791 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A8BB19F1C4 for ; Mon, 16 Jun 2014 21:21:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CE04320179 for ; Mon, 16 Jun 2014 21:20:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B3A8B200F3 for ; Mon, 16 Jun 2014 21:20:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WweCW-0002H3-4T; Mon, 16 Jun 2014 21:12:24 +0000 Received: from avon.wwwdotorg.org ([70.85.31.133]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WweCT-0002El-Ux for linux-arm-kernel@lists.infradead.org; Mon, 16 Jun 2014 21:12:22 +0000 Received: from severn.wwwdotorg.org (unknown [192.168.65.5]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by avon.wwwdotorg.org (Postfix) with ESMTPS id BDAFE6446; Mon, 16 Jun 2014 15:12:00 -0600 (MDT) Received: from swarren-lx1.nvidia.com (localhost [127.0.0.1]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by severn.wwwdotorg.org (Postfix) with ESMTPSA id 9BA62E4569; Mon, 16 Jun 2014 15:11:59 -0600 (MDT) From: Stephen Warren To: Stephen Warren , Thierry Reding Subject: [PATCH] misc: fuse: fix dummy functions Date: Mon, 16 Jun 2014 15:11:55 -0600 Message-Id: <1402953115-32489-1-git-send-email-swarren@wwwdotorg.org> X-Mailer: git-send-email 1.8.1.5 X-NVConfidentiality: public X-Virus-Scanned: clamav-milter 0.97.8 at avon.wwwdotorg.org X-Virus-Status: Clean X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140616_141222_039034_CDD2A5B9 X-CRM114-Status: GOOD ( 10.40 ) X-Spam-Score: -1.0 (-) Cc: linux-tegra@vger.kernel.org, Peter De Schrijver , Stephen Warren , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Stephen Warren The Tegra fuse header's dummy functions for the case where Tegra20 is disabled are inconsistent with the correct prototypes, and have some syntax errors. Fix these. While at it, fix the indentation level of the dummy function bodies. Fixes: 40969e30ad7c ("misc: fuse: Add efuse driver for Tegra") Cc: Peter De Schrijver Signed-off-by: Stephen Warren Acked-by: Peter De Schrijver --- I intend to immediately apply this to Tegra's for-3.17/fuse-move branch. --- drivers/misc/fuse/tegra/fuse.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/misc/fuse/tegra/fuse.h b/drivers/misc/fuse/tegra/fuse.h index b3442770df09..3a398bf3572c 100644 --- a/drivers/misc/fuse/tegra/fuse.h +++ b/drivers/misc/fuse/tegra/fuse.h @@ -38,14 +38,14 @@ void tegra20_init_fuse_early(void); u32 tegra20_fuse_early(const unsigned int offset); #else static inline void tegra20_init_speedo_data(struct tegra_sku_info *sku_info) {} -static inline bool tegra20_spare_fuse_early(int spare_bit, void *fuse_base) +static inline bool tegra20_spare_fuse_early(int spare_bit) { - return false; + return false; } -static inline void tegra20_init_fuse_early(void); -static inline tegra20_fuse_early(const unsigned int offset); +static inline void tegra20_init_fuse_early(void) {} +static inline u32 tegra20_fuse_early(const unsigned int offset) { - return 0; + return 0; } #endif