public inbox for linux-ide@vger.kernel.org
 help / color / mirror / Atom feed
From: Damien Le Moal <damien.lemoal@opensource.wdc.com>
To: linux-ide@vger.kernel.org,
	"Maciej S . Szmigiero" <mail@maciej.szmigiero.name>
Cc: Hannes Reinecke <hare@suse.de>
Subject: [PATCH v3 2/6] ata: libata: Rename and cleanup ata_rwcmd_protocol()
Date: Thu, 27 Oct 2022 16:50:22 +0900	[thread overview]
Message-ID: <20221027075026.240017-3-damien.lemoal@opensource.wdc.com> (raw)
In-Reply-To: <20221027075026.240017-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
corretly (instead of returning a completely arbitrary "-1" value.

Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
---
 drivers/ata/libata-core.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 884ae73b11ea..56ddcbaa0c6f 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
+ *	ata_set_rwcmd_protocol - set taskfile r/w command and protocol
+ *	@dev: target device for the tf
  *	@tf: command to examine and configure
- *	@dev: device tf belongs to
  *
- *	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.
  *
  *	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.37.3


  parent reply	other threads:[~2022-10-27  7:50 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-27  7:50 [PATCH v3 0/6] Improve libata support for FUA Damien Le Moal
2022-10-27  7:50 ` [PATCH v3 1/6] ata: libata: Introduce ata_ncq_supported() Damien Le Moal
2022-10-27  9:24   ` Hannes Reinecke
2022-10-27  7:50 ` Damien Le Moal [this message]
2022-10-27  9:25   ` [PATCH v3 2/6] ata: libata: Rename and cleanup ata_rwcmd_protocol() Hannes Reinecke
2022-10-27  9:43   ` Sergei Shtylyov
2022-10-27  7:50 ` [PATCH v3 3/6] ata: libata: cleanup fua handling Damien Le Moal
2022-10-27  9:32   ` Hannes Reinecke
2022-10-27  7:50 ` [PATCH v3 4/6] ata: libata: Fix FUA handling in ata_build_rw_tf() Damien Le Moal
2022-10-27  8:21   ` Niklas Cassel
2022-10-27  9:12     ` Damien Le Moal
2022-10-27  9:42   ` Hannes Reinecke
2022-10-27 22:22     ` Damien Le Moal
2022-10-28 10:01       ` Hannes Reinecke
2022-10-28 16:45       ` Maciej S. Szmigiero
2022-10-28 16:45   ` Maciej S. Szmigiero
2022-10-27  7:50 ` [PATCH v3 5/6] ata: libata: blacklist FUA support for known buggy drives Damien Le Moal
2022-10-27  7:50 ` [PATCH v3 6/6] ata: libata: Enable fua support by default 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=20221027075026.240017-3-damien.lemoal@opensource.wdc.com \
    --to=damien.lemoal@opensource.wdc.com \
    --cc=hare@suse.de \
    --cc=linux-ide@vger.kernel.org \
    --cc=mail@maciej.szmigiero.name \
    /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