From patchwork Mon Aug 2 15:23:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 12414275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 61DD3C4338F for ; Mon, 2 Aug 2021 15:26:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 30A2E604D7 for ; Mon, 2 Aug 2021 15:26:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 30A2E604D7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FN+J+Pv2Nb6kqogVvIX1GlqOcJX/g/JPrddOEJ6n53A=; b=NZ2OKSVANCCQst IuEzTYmPD9YePrmY2dHtHEG9VIO1tBvpXudFYEkuXcg5Mv0RjflkzIsXAdp88PIQLwo0TJJOwnVnB uhFnPC0lckTyYp0yIXJNt6J40vHIBWjJ9dA3PA/TmwvW5huZNPbeov5MWap/BaIiFIRsbY74YxyKf JpOCZeNycxicJvgxdn+T+f654/FVr+qUOOQnaeTn8/XNxCiZU+vL982B0+B+Wpa6XZG/enxnudHQ3 tc7siw4Oj8DVRLKtCCn+S9pRO+MkbfSgdEYKpCBqlwF3Hcd4CZGVbec5wzOrTy6LRYvxyaZTvx0al GFbLGxKYZQAST5JzKKXg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAZo6-00GvX8-Mh; Mon, 02 Aug 2021 15:24:46 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mAZne-00GvNb-E4 for linux-arm-kernel@lists.infradead.org; Mon, 02 Aug 2021 15:24:20 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3F02B12FC; Mon, 2 Aug 2021 08:24:17 -0700 (PDT) Received: from e123427-lin.arm.com (unknown [10.57.39.152]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5AD013F66F; Mon, 2 Aug 2021 08:24:14 -0700 (PDT) From: Lorenzo Pieralisi To: linux-kernel@vger.kernel.org Cc: Lorenzo Pieralisi , Ard Biesheuvel , "Rafael J. Wysocki" , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Veronika kabatova , Robin Murphy , Will Deacon , Hanjun Guo , Sudeep Holla , Catalin Marinas Subject: [PATCH v2 2/3] ACPI: osl: Reorder acpi_os_map_iomem() __ref annotation Date: Mon, 2 Aug 2021 16:23:58 +0100 Message-Id: <20210802152359.12623-3-lorenzo.pieralisi@arm.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210726100026.12538-1-lorenzo.pieralisi@arm.com> References: <20210726100026.12538-1-lorenzo.pieralisi@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210802_082418_615337_4C266F70 X-CRM114-Status: GOOD ( 11.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The __ref annotation has nothing to do with the acpi_os_map_iomem() return value type. Redefine the acpi_os_map_iomem() function prototype to avoid mixing the __ref annotation with the return type declaration. Signed-off-by: Lorenzo Pieralisi Cc: Ard Biesheuvel Cc: "Rafael J. Wysocki" --- drivers/acpi/osl.c | 4 ++-- include/acpi/acpi_io.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 8f67bf0f090b..fdee0c6f4f7f 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -321,8 +321,8 @@ static void acpi_unmap(acpi_physical_address pg_off, void __iomem *vaddr) * During early init (when acpi_permanent_mmap has not been set yet) this * routine simply calls __acpi_map_table() to get the job done. */ -void __iomem __ref -*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) +void __iomem *__ref +acpi_os_map_iomem(acpi_physical_address phys, acpi_size size) { struct acpi_ioremap *map; void __iomem *virt; diff --git a/include/acpi/acpi_io.h b/include/acpi/acpi_io.h index 027faa8883aa..a0094420303f 100644 --- a/include/acpi/acpi_io.h +++ b/include/acpi/acpi_io.h @@ -16,8 +16,8 @@ static inline void __iomem *acpi_os_ioremap(acpi_physical_address phys, extern bool acpi_permanent_mmap; -void __iomem __ref -*acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); +void __iomem *__ref +acpi_os_map_iomem(acpi_physical_address phys, acpi_size size); void __ref acpi_os_unmap_iomem(void __iomem *virt, acpi_size size); void __iomem *acpi_os_get_iomem(acpi_physical_address phys, unsigned int size);