From patchwork Fri Apr 26 16:56:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Leis X-Patchwork-Id: 10919425 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 61F7114D5 for ; Fri, 26 Apr 2019 16:57:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E2F428E24 for ; Fri, 26 Apr 2019 16:57:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F57728E30; Fri, 26 Apr 2019 16:57:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A433028E24 for ; Fri, 26 Apr 2019 16:57:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:Mime-Version:Message-Id :Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=ibSrwQoWvtFNintUaQytkxqRpV0TYGeVDiNvpXfxyl0=; b=I+o6vitZiL9uVW y0Slg6jqncgnxgm2Mi6mBqeNZqdBCBHZprbA8LI+okYE8LVDABFZym9iJV8vcTmu/YHJFlfF74UjZ u8L5q5+5SslICL1gC1YvXaMz19v1U8gchUqbHWu7x06RyFGfsiBYq45tV9NBllFx3E6MfaWdUqtiF Uj4TqLonkg6dPgWfSOvr3P82SKLwGJh2dhU7ehonaP7fInjJGk25xaWtYZaTxfEUiQAl4rQ4ihs1W sx9Rvtx5MxlzOWoNwM/haBMEPll83/IiaHbatV6u91POvZq5VoyUCK+I05jMcHhgSwWUHs7FkQtK5 Nca7nijx/o55YlzAemFQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hK49p-0000oq-Ly; Fri, 26 Apr 2019 16:57:05 +0000 Received: from mail-ot1-x34a.google.com ([2607:f8b0:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hK49m-0000oC-5J for linux-arm-kernel@lists.infradead.org; Fri, 26 Apr 2019 16:57:03 +0000 Received: by mail-ot1-x34a.google.com with SMTP id o13so1917514otk.12 for ; Fri, 26 Apr 2019 09:57:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=LdtpNCBMXVEYh5+9sDcKIELQmRtwCEZfEh/KIYFOBOU=; b=tstw7iZxA9nBCcJm42TviKa3bi3ItAr7vfTnG5YC9Kqym6BPPvFKMw4mIP/esb1Yre /CMlYKOQJbOgKiCHWaeSZ1w+/XYFN9f4aLobh+zg4n7IbmnPQc0jkvCsUIRTDwa43Zwb 84S7GwrJ2F6mS7l2MkMjUuUxw+3zWXnLRozAko6nXAOUz0MgIg+mnXnwHXPSwr2ULpB6 83/g53qmLpOfbAncr55eDmfW0C+yLh0R8/TRQOJT9CC8Or6uneQm0hbGPU/omorcfvGZ HcW6GH6eQ3lBvlPYvVs2YVDA2D6CmSxTljsmMGFbTMU1Rm17Z9MsIRgy1L4Xx4k1uz4D yXPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=LdtpNCBMXVEYh5+9sDcKIELQmRtwCEZfEh/KIYFOBOU=; b=PWxYB32qlNA/Fcm0e78gZUcFK1zFVg3GeviReKzP6agyS9Pa5jqnxZJMfm2PuvvyAj IV/+U0SpNYv7Cb6V9y9oHfUO/AYnQRQBFrJi5v87tZIyl6HoknNrxCbiO5ezcaCWP8CY IjfNuklsReRp6nzAd5dwz1eaLcVCGSgnzA9kX8QTysvTbccUiUTap1VCg4uRE6MtvvI8 ZXRR/AAbp0QfkhHdI0TC5PZ/lCSjOWFUfyUHwB90mh2MGqI97nHdkwCf78DZot/2nSKr MuQnj/aNqfGhUHbXVY7Ap+7+IJqgkzYpbvtx+TMEoJBm0ozw8D93q863/3Xo/Zs045Ku pLaw== X-Gm-Message-State: APjAAAXj02jWKc8fZ7zVwVOENcTLoqsH3hEimAs/exMqM8Zc1j0bnKc+ cftBi820/Ytxu4CVkdqUtWTzehz6hQpW X-Google-Smtp-Source: APXvYqxENZKm3ZkZkcsCV1tk0VR2N3BgC4a0+IxpAnry9JlIqN/BVvLewUEqBomJYIiy3BCfhYSlTLwujoih X-Received: by 2002:aca:5d57:: with SMTP id r84mr7966908oib.143.1556297820067; Fri, 26 Apr 2019 09:57:00 -0700 (PDT) Date: Fri, 26 Apr 2019 09:56:55 -0700 Message-Id: <20190426165655.218228-1-venture@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH] misc: aspeed-p2a-ctrl: fix mixed declarations From: Patrick Venture To: venture@google.com, arnd@arndb.de, gregkh@linuxfoundation.org, joel@jms.id.au, andrew@aj.id.au X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190426_095702_227691_B3887126 X-CRM114-Status: GOOD ( 11.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stephen Rothwell , arm@kernel.org, linux-aspeed@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Fix up mixed declarations and code in aspeed_p2a_mmap. Tested: Verified the build had the error and that this patch resolved it and there were no other warnings or build errors associated with compilation of this driver. Reported-by: Stephen Rothwell Signed-off-by: Patrick Venture Reviewed-by: Joel Stanley Reviewed-by: Andrew Jeffery --- drivers/misc/aspeed-p2a-ctrl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/misc/aspeed-p2a-ctrl.c b/drivers/misc/aspeed-p2a-ctrl.c index 9736821972ef..b60fbeaffcbd 100644 --- a/drivers/misc/aspeed-p2a-ctrl.c +++ b/drivers/misc/aspeed-p2a-ctrl.c @@ -100,6 +100,7 @@ static void aspeed_p2a_disable_bridge(struct aspeed_p2a_ctrl *p2a_ctrl) static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma) { unsigned long vsize; + pgprot_t prot; struct aspeed_p2a_user *priv = file->private_data; struct aspeed_p2a_ctrl *ctrl = priv->parent; @@ -107,7 +108,7 @@ static int aspeed_p2a_mmap(struct file *file, struct vm_area_struct *vma) return -EINVAL; vsize = vma->vm_end - vma->vm_start; - pgprot_t prot = vma->vm_page_prot; + prot = vma->vm_page_prot; if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size) return -EINVAL;