From: Damien Le Moal <dlemoal@kernel.org>
To: linux-ide@vger.kernel.org, Niklas Cassel <cassel@kernel.org>,
linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>
Subject: [PATCH v2 1/5] ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type
Date: Fri, 18 Apr 2025 16:55:13 +0900 [thread overview]
Message-ID: <20250418075517.369098-2-dlemoal@kernel.org> (raw)
In-Reply-To: <20250418075517.369098-1-dlemoal@kernel.org>
The function ata_mselect_control_ata_feature() has a return type defined
as unsigned int but this function may return negative error codes, which
are correctly propagated up the call chain as integers.
Fix ata_mselect_control_ata_feature() to have the correct int return
type.
While at it, also fix a typo in this function description comment.
Fixes: df60f9c64576 ("scsi: ata: libata: Add ATA feature control sub-page translation")
Cc: stable@vger.kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
drivers/ata/libata-scsi.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c
index 2796c0da8257..24e662c837e3 100644
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
@@ -3886,12 +3886,11 @@ static int ata_mselect_control_spg0(struct ata_queued_cmd *qc,
}
/*
- * Translate MODE SELECT control mode page, sub-pages f2h (ATA feature mode
+ * Translate MODE SELECT control mode page, sub-page f2h (ATA feature mode
* page) into a SET FEATURES command.
*/
-static unsigned int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
- const u8 *buf, int len,
- u16 *fp)
+static int ata_mselect_control_ata_feature(struct ata_queued_cmd *qc,
+ const u8 *buf, int len, u16 *fp)
{
struct ata_device *dev = qc->dev;
struct ata_taskfile *tf = &qc->tf;
--
2.49.0
next prev parent reply other threads:[~2025-04-18 7:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-18 7:55 [PATCH v2 0/5] CDL Feature control improvements Damien Le Moal
2025-04-18 7:55 ` Damien Le Moal [this message]
2025-04-18 8:14 ` [PATCH v2 1/5] ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type Niklas Cassel
2025-04-18 7:55 ` [PATCH v2 2/5] ata: libata-scsi: Fail MODE SELECT for unsupported mode pages Damien Le Moal
2025-04-18 8:40 ` Niklas Cassel
2025-04-18 9:30 ` Damien Le Moal
2025-04-18 11:45 ` Niklas Cassel
2025-04-18 23:02 ` Damien Le Moal
2025-04-18 7:55 ` [PATCH v2 3/5] ata: libata-scsi: Fix ata_msense_control_ata_feature() Damien Le Moal
2025-04-18 7:55 ` [PATCH v2 4/5] ata: libata-scsi: Improve CDL control Damien Le Moal
2025-04-18 7:55 ` [PATCH v2 5/5] scsi: " 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=20250418075517.369098-2-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=cassel@kernel.org \
--cc=linux-ide@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.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