From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux ACPI <linux-acpi@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Erik Kaneda <erik.kaneda@intel.com>,
Bob Moore <robert.moore@intel.com>,
Len Brown <len.brown@intel.com>,
Dan Williams <dan.j.williams@intel.com>,
Dan Williams <dan.j.williams.korg@gmail.com>
Subject: [PATCH 3/3] ACPI: OSL: Clean up the removal of unused memory mappings
Date: Thu, 02 Jul 2020 14:14:05 +0200 [thread overview]
Message-ID: <3982287.opqQOJBojm@kreacher> (raw)
In-Reply-To: <22474080.3crLlKV2y5@kreacher>
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Fold acpi_os_map_cleanup_deferred() into acpi_os_map_remove() and
pass the latter to INIT_RCU_WORK() in acpi_os_drop_map_ref() to make
the code more straightforward.
No intentional functional impact.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/osl.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 816d9f8ac6b6..6ad8cb05f672 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -377,18 +377,16 @@ void *__ref acpi_os_map_memory(acpi_physical_address phys, acpi_size size)
}
EXPORT_SYMBOL_GPL(acpi_os_map_memory);
-static void acpi_os_map_remove(struct acpi_ioremap *map)
+static void acpi_os_map_remove(struct work_struct *work)
{
+ struct acpi_ioremap *map = container_of(to_rcu_work(work),
+ struct acpi_ioremap,
+ track.rwork);
+
acpi_unmap(map->phys, map->virt);
kfree(map);
}
-static void acpi_os_map_cleanup_deferred(struct work_struct *work)
-{
- acpi_os_map_remove(container_of(to_rcu_work(work), struct acpi_ioremap,
- track.rwork));
-}
-
/* Must be called with mutex_lock(&acpi_ioremap_lock) */
static void acpi_os_drop_map_ref(struct acpi_ioremap *map)
{
@@ -397,7 +395,7 @@ static void acpi_os_drop_map_ref(struct acpi_ioremap *map)
list_del_rcu(&map->list);
- INIT_RCU_WORK(&map->track.rwork, acpi_os_map_cleanup_deferred);
+ INIT_RCU_WORK(&map->track.rwork, acpi_os_map_remove);
queue_rcu_work(system_wq, &map->track.rwork);
}
--
2.26.2
prev parent reply other threads:[~2020-07-02 12:17 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-02 12:09 [PATCH 0/3] ACPI: OSL: Always use deferred unmapping of memory Rafael J. Wysocki
2020-07-02 12:11 ` [PATCH 1/3] ACPI: OSL: Use deferred unmapping in acpi_os_unmap_generic_address() Rafael J. Wysocki
2020-07-02 12:13 ` [PATCH 2/3] ACPI: OSL: Use deferred unmapping in acpi_os_unmap_iomem() Rafael J. Wysocki
2020-07-02 12:14 ` Rafael J. Wysocki [this message]
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=3982287.opqQOJBojm@kreacher \
--to=rjw@rjwysocki.net \
--cc=dan.j.williams.korg@gmail.com \
--cc=dan.j.williams@intel.com \
--cc=erik.kaneda@intel.com \
--cc=len.brown@intel.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robert.moore@intel.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.