From: Damien Le Moal <dlemoal@kernel.org>
To: linux-ide@vger.kernel.org
Cc: linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
John Garry <john.g.garry@oracle.com>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Paul Ausbeck <paula@soe.ucsc.edu>,
Kai-Heng Feng <kai.heng.feng@canonical.com>,
Joe Breuer <linux-kernel@jmbreuer.net>
Subject: [PATCH v2 15/21] ata: libata-core: Remove ata_port_resume_async()
Date: Tue, 12 Sep 2023 09:56:49 +0900 [thread overview]
Message-ID: <20230912005655.368075-16-dlemoal@kernel.org> (raw)
In-Reply-To: <20230912005655.368075-1-dlemoal@kernel.org>
Remove ata_port_resume_async() and replace it with a modified
ata_port_resume() taking an additional bool argument indicating if
ata EH resume operation should be executed synchronously or
asynchronously. With this change, the variable ata_port_resume_ehi is
not longer necessary and its value (ATA_EHI_XXX flags) passed directly
to ata_port_request_pm().
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.de>
---
drivers/ata/libata-core.c | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index cdfe71ae6a6c..a4389dd807e5 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -5223,22 +5223,17 @@ static int ata_port_pm_poweroff(struct device *dev)
return 0;
}
-static const unsigned int ata_port_resume_ehi = ATA_EHI_NO_AUTOPSY
- | ATA_EHI_QUIET;
-
-static void ata_port_resume(struct ata_port *ap, pm_message_t mesg)
+static void ata_port_resume(struct ata_port *ap, pm_message_t mesg,
+ bool async)
{
- ata_port_request_pm(ap, mesg, ATA_EH_RESET, ata_port_resume_ehi, false);
-}
-
-static void ata_port_resume_async(struct ata_port *ap, pm_message_t mesg)
-{
- ata_port_request_pm(ap, mesg, ATA_EH_RESET, ata_port_resume_ehi, true);
+ ata_port_request_pm(ap, mesg, ATA_EH_RESET,
+ ATA_EHI_NO_AUTOPSY | ATA_EHI_QUIET,
+ async);
}
static int ata_port_pm_resume(struct device *dev)
{
- ata_port_resume_async(to_ata_port(dev), PMSG_RESUME);
+ ata_port_resume(to_ata_port(dev), PMSG_RESUME, true);
pm_runtime_disable(dev);
pm_runtime_set_active(dev);
pm_runtime_enable(dev);
@@ -5277,7 +5272,7 @@ static int ata_port_runtime_suspend(struct device *dev)
static int ata_port_runtime_resume(struct device *dev)
{
- ata_port_resume(to_ata_port(dev), PMSG_AUTO_RESUME);
+ ata_port_resume(to_ata_port(dev), PMSG_AUTO_RESUME, false);
return 0;
}
@@ -5307,7 +5302,7 @@ EXPORT_SYMBOL_GPL(ata_sas_port_suspend);
void ata_sas_port_resume(struct ata_port *ap)
{
- ata_port_resume_async(ap, PMSG_RESUME);
+ ata_port_resume(ap, PMSG_RESUME, true);
}
EXPORT_SYMBOL_GPL(ata_sas_port_resume);
--
2.41.0
next prev parent reply other threads:[~2023-09-12 1:14 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 0:56 [PATCH v2 00/21] Fix libata suspend/resume handling and code cleanup Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 01/21] ata: libata-core: Fix ata_port_request_pm() locking Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 02/21] ata: libata-core: Fix port and device removal Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 03/21] ata: libata-scsi: link ata port and scsi device Damien Le Moal
2023-09-13 10:25 ` Geert Uytterhoeven
2023-09-14 7:08 ` Geert Uytterhoeven
2023-09-14 7:18 ` Damien Le Moal
2023-09-14 13:18 ` Damien Le Moal
2023-09-14 13:43 ` Geert Uytterhoeven
2023-09-12 0:56 ` [PATCH v2 04/21] ata: libata-scsi: Disable scsi device manage_start_stop Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 05/21] ata: libata-scsi: Fix delayed scsi_rescan_device() execution Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 06/21] ata: libata-core: Do not register PM operations for SAS ports Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 07/21] scsi: sd: Do not issue commands to suspended disks on remove Damien Le Moal
2023-09-14 14:48 ` Bart Van Assche
2023-09-14 22:06 ` Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 08/21] ata: libata-core: Fix compilation warning in ata_dev_config_ncq() Damien Le Moal
2023-09-12 6:14 ` Hannes Reinecke
2023-09-12 0:56 ` [PATCH v2 09/21] ata: libata-eh: Fix compilation warning in ata_eh_link_report() Damien Le Moal
2023-09-12 6:14 ` Hannes Reinecke
2023-09-12 0:56 ` [PATCH v2 10/21] scsi: Remove scsi device no_start_on_resume flag Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 11/21] ata: libata-scsi: Cleanup ata_scsi_start_stop_xlat() Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 12/21] ata: libata-core: Synchronize ata_port_detach() with hotplug Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 13/21] ata: libata-core: Detach a port devices on shutdown Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 14/21] ata: libata-core: Remove ata_port_suspend_async() Damien Le Moal
2023-09-12 0:56 ` Damien Le Moal [this message]
2023-09-12 0:56 ` [PATCH v2 16/21] ata: libata-core: skip poweroff for devices that are runtime suspended Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 17/21] ata: libata-core: Do not resume ports that have been " Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 18/21] ata: libata-sata: Improve ata_sas_slave_configure() Damien Le Moal
2023-09-12 7:43 ` John Garry
2023-09-12 7:52 ` Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 19/21] ata: libata-eh: Improve reset error messages Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 20/21] ata: libata-eh: Reduce "disable device" message verbosity Damien Le Moal
2023-09-12 0:56 ` [PATCH v2 21/21] ata: libata: Cleanup inline DMA helper functions Damien Le Moal
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=20230912005655.368075-16-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=john.g.garry@oracle.com \
--cc=kai.heng.feng@canonical.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@jmbreuer.net \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=paula@soe.ucsc.edu \
--cc=rodrigo.vivi@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox