From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
To: linux-ide@vger.kernel.org, linux-block@vger.kernel.org,
Jens Axboe <axboe@kernel.dk>
Cc: "Maciej S . Szmigiero" <mail@maciej.szmigiero.name>,
Hannes Reinecke <hare@suse.de>, Christoph Hellwig <hch@lst.de>,
Niklas Cassel <niklas.cassel@wdc.com>
Subject: [PATCH v7 3/7] ata: libata: Rename and cleanup ata_rwcmd_protocol()
Date: Tue, 3 Jan 2023 14:19:20 +0900 [thread overview]
Message-ID: <20230103051924.233796-4-damien.lemoal@opensource.wdc.com> (raw)
In-Reply-To: <20230103051924.233796-1-damien.lemoal@opensource.wdc.com>
Rename ata_rwcmd_protocol() to ata_set_rwcmd_protocol() to better
reflect the fact that this function sets a task file command and
protocol. The arguments order is also reversed and the function return
type changed to a bool to indicate if the command and protocol were set
correctly (instead of returning a completely arbitrary "-1" value.
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Niklas Cassel <niklas.cassel@wdc.com>
---
drivers/ata/libata-core.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 884ae73b11ea..6ee1cbac3ab0 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -574,17 +574,18 @@ static const u8 ata_rw_cmds[] = {
};
/**
- * ata_rwcmd_protocol - set taskfile r/w commands and protocol
- * @tf: command to examine and configure
- * @dev: device tf belongs to
+ * ata_set_rwcmd_protocol - set taskfile r/w command and protocol
+ * @dev: target device for the taskfile
+ * @tf: taskfile to examine and configure
*
- * Examine the device configuration and tf->flags to calculate
- * the proper read/write commands and protocol to use.
+ * Examine the device configuration and tf->flags to determine
+ * the proper read/write command and protocol to use for @tf.
*
* LOCKING:
* caller.
*/
-static int ata_rwcmd_protocol(struct ata_taskfile *tf, struct ata_device *dev)
+static bool ata_set_rwcmd_protocol(struct ata_device *dev,
+ struct ata_taskfile *tf)
{
u8 cmd;
@@ -607,11 +608,12 @@ static int ata_rwcmd_protocol(struct ata_taskfile *tf, struct ata_device *dev)
}
cmd = ata_rw_cmds[index + fua + lba48 + write];
- if (cmd) {
- tf->command = cmd;
- return 0;
- }
- return -1;
+ if (!cmd)
+ return false;
+
+ tf->command = cmd;
+
+ return true;
}
/**
@@ -744,7 +746,7 @@ int ata_build_rw_tf(struct ata_queued_cmd *qc, u64 block, u32 n_block,
/* request too large even for LBA48 */
return -ERANGE;
- if (unlikely(ata_rwcmd_protocol(tf, dev) < 0))
+ if (unlikely(!ata_set_rwcmd_protocol(dev, tf)))
return -EINVAL;
tf->nsect = n_block & 0xff;
@@ -762,7 +764,7 @@ int ata_build_rw_tf(struct ata_queued_cmd *qc, u64 block, u32 n_block,
if (!lba_28_ok(block, n_block))
return -ERANGE;
- if (unlikely(ata_rwcmd_protocol(tf, dev) < 0))
+ if (unlikely(!ata_set_rwcmd_protocol(dev, tf)))
return -EINVAL;
/* Convert LBA to CHS */
--
2.39.0
next prev parent reply other threads:[~2023-01-03 5:22 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 5:19 [PATCH v7 0/7] Improve libata support for FUA Damien Le Moal
2023-01-03 5:19 ` [PATCH v7 1/7] block: add a sanity check for non-write flush/fua bios Damien Le Moal
2023-01-03 8:05 ` Niklas Cassel
2023-01-03 12:46 ` Damien Le Moal
2023-01-03 13:02 ` Niklas Cassel
2023-01-04 14:23 ` Ming Lei
2023-01-05 3:54 ` Damien Le Moal
2023-01-03 5:19 ` [PATCH v7 2/7] ata: libata: Introduce ata_ncq_supported() Damien Le Moal
2023-01-03 5:19 ` Damien Le Moal [this message]
2023-01-03 5:19 ` [PATCH v7 4/7] ata: libata: cleanup fua support detection Damien Le Moal
2023-01-03 5:19 ` [PATCH v7 5/7] ata: libata: Fix FUA handling in ata_build_rw_tf() Damien Le Moal
2023-01-03 5:19 ` [PATCH v7 6/7] ata: libata: blacklist FUA support for known buggy drives Damien Le Moal
2023-01-03 5:19 ` [PATCH v7 7/7] ata: libata: Enable fua support by default Damien Le Moal
2023-01-04 16:49 ` [PATCH v7 0/7] Improve libata support for FUA Tejun Heo
2023-01-05 3:43 ` Damien Le Moal
2023-01-05 18:15 ` Tejun Heo
2023-01-06 6:51 ` Damien Le Moal
2023-01-06 18:03 ` Tejun Heo
2023-01-10 13:23 ` 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=20230103051924.233796-4-damien.lemoal@opensource.wdc.com \
--to=damien.lemoal@opensource.wdc.com \
--cc=axboe@kernel.dk \
--cc=hare@suse.de \
--cc=hch@lst.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=mail@maciej.szmigiero.name \
--cc=niklas.cassel@wdc.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