LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
To: linux-kernel@vger.kernel.org
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Ard Biesheuvel <ardb@kernel.org>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Veronika kabatova <vkabatov@redhat.com>,
	Robin Murphy <robin.murphy@arm.com>,
	Will Deacon <will@kernel.org>, Hanjun Guo <guohanjun@huawei.com>,
	Sudeep Holla <sudeep.holla@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>
Subject: [PATCH v2 2/3] ACPI: osl: Reorder acpi_os_map_iomem() __ref annotation
Date: Mon,  2 Aug 2021 16:23:58 +0100	[thread overview]
Message-ID: <20210802152359.12623-3-lorenzo.pieralisi@arm.com> (raw)
In-Reply-To: <20210726100026.12538-1-lorenzo.pieralisi@arm.com>

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 <lorenzo.pieralisi@arm.com>
Cc: Ard Biesheuvel <ardb@kernel.org>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
---
 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);
 
-- 
2.31.0


  parent reply	other threads:[~2021-08-02 15:24 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-26 10:00 [PATCH] ACPI: Add memory semantics to acpi_os_map_memory() Lorenzo Pieralisi
2021-07-26 15:55 ` Ard Biesheuvel
2021-07-27 10:06   ` Lorenzo Pieralisi
2021-07-27 10:09     ` Ard Biesheuvel
2021-07-27 16:38       ` Lorenzo Pieralisi
2021-07-27  4:21 ` Hanjun Guo
2021-08-02 15:23 ` [PATCH v2 0/3] ACPI: Fix acpi_os_map_memory() memory semantics Lorenzo Pieralisi
2021-08-02 15:37   ` Ard Biesheuvel
2021-08-23 10:35   ` [PATCH v3] ACPI: Add memory semantics to acpi_os_map_memory() Lorenzo Pieralisi
2021-08-23 10:46   ` [PATCH RESEND " Lorenzo Pieralisi
2021-08-23 12:30     ` Catalin Marinas
2021-08-25 17:46       ` Rafael J. Wysocki
2021-08-02 15:23 ` [PATCH v2 1/3] ACPI: osl: Add __force attribute in acpi_os_map_iomem() cast Lorenzo Pieralisi
2021-08-10 16:45   ` Christoph Hellwig
2021-08-11 10:40     ` Ard Biesheuvel
2021-08-11 14:01       ` Lorenzo Pieralisi
2021-08-11 14:08       ` Christoph Hellwig
2021-08-11 14:55         ` Lorenzo Pieralisi
2021-08-16  9:58           ` Lorenzo Pieralisi
2021-08-16 10:21             ` Ard Biesheuvel
2021-08-16 10:59               ` Robin Murphy
2021-08-16 13:57               ` Rafael J. Wysocki
2021-08-02 15:23 ` Lorenzo Pieralisi [this message]
2021-08-02 15:23 ` [PATCH v2 3/3] ACPI: Add memory semantics to acpi_os_map_memory() Lorenzo Pieralisi
2021-08-02 16:46   ` Catalin Marinas
2021-08-03  9:16     ` Lorenzo Pieralisi
2021-08-05 19:02       ` Rafael J. Wysocki

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210802152359.12623-3-lorenzo.pieralisi@arm.com \
    --to=lorenzo.pieralisi@arm.com \
    --cc=ardb@kernel.org \
    --cc=catalin.marinas@arm.com \
    --cc=guohanjun@huawei.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rjw@rjwysocki.net \
    --cc=robin.murphy@arm.com \
    --cc=sudeep.holla@arm.com \
    --cc=vkabatov@redhat.com \
    --cc=will@kernel.org \
    --subject='Re: [PATCH v2 2/3] ACPI: osl: Reorder acpi_os_map_iomem() __ref annotation' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).