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: 490364 Delivered-To: patch@linaro.org Received: by 2002:a05:6638:1185:0:0:0:0 with SMTP id f5csp2027375jas; Mon, 2 Aug 2021 08:24:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrjbcDbiy6qqlhLH8DmOnxgY+HJ4oQcuTs4BJANriXorqGAVfZbgZwGMA2fAJdxcxSSzdA X-Received: by 2002:a05:6e02:1a83:: with SMTP id k3mr1085829ilv.150.1627917860283; Mon, 02 Aug 2021 08:24:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627917860; cv=none; d=google.com; s=arc-20160816; b=LjyrPXU1MqtZffOhrH3k8CsG2/1QtRz2dkPQI3tAkTfHXVHsLLbuUDR82KbPuvkBbs MfsCdp2VaqA0iVu8SAlUh4izuDoFFFyZYuRka2w7WgSidJi24DIcPP21zAge6ehYc+iS 4cpWxL2uUYJG2QZEERAI1G+3/xFrpCxoAYjG/igVkW6Sx4ZCjUBAVvUWO68/nbHC+VRJ Jr8U1NtWaLBA4Yfl6ce7rvVNKzVcq9L1TaTvYI5aUzZ8F+BHzWmWxDPXfGqKVauTcBUP W1r9NCdfpPT0P5CPguBGRsyrS0qt71gJn4jBTaK4FPI9mOH9fkvXJcoRNFmiJfC4HAoZ m5fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=BOf7JVM9cZ2/Flm9roXx3D2z4TsDdEdCPOyhD6WjFe4=; b=wpbHmBx51qKWsTpmVVIw6PasFSpkgaK4Ue7RQyp3GrjTMdWkYJvWbkNkHGFpy0moYs i9PJ0gbKfPV+LmIS/K9HGz9AgrR6p3nPTfqzhh7KLxunQcY61TNM+t0ZukIJqHoyYFYb YRdQLwQBLzxnt5eYjYonvHbNupo6gI/ctk8ysIDkQCOOoCM1lFMDvGYYnDiJA22YqF5L lzyiXGgip0oxLSDFfZ4vNFdCgU722h8y28+JymiM4Lq4OVhFWyhAbpenlV5GnK7Kgcs1 QLG0FmUr2yR6K8o6/SZpY1lKrWt37aZ/W4Aq/MciTX7ZOCFuOsxViwg5EFOt7ktYB2Ro xkOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id i20si1599760jaj.74.2021.08.02.08.24.20; Mon, 02 Aug 2021 08:24:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-acpi-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235085AbhHBPY2 (ORCPT + 4 others); Mon, 2 Aug 2021 11:24:28 -0400 Received: from foss.arm.com ([217.140.110.172]:37504 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234852AbhHBPY1 (ORCPT ); Mon, 2 Aug 2021 11:24:27 -0400 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 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.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(-) -- 2.31.0 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);