On 11/07/2025 09:35, Damien Le Moal wrote:
/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index 7b4e7a61965a..adb9e7a94785 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -559,8 +559,8 @@ static int sas_ata_prereset(struct ata_link *link, unsigned long deadline)
}
static struct ata_port_operations sas_sata_ops = {
- .prereset = sas_ata_prereset,
- .hardreset = sas_ata_hard_reset,
+ .reset.prereset = sas_ata_prereset,
+ .reset.hardreset = sas_ata_hard_reset,
Personally I think that this is a nicer style:
static struct ata_port_operations sas_sata_ops = {
.reset = {
.prereset = sas_ata_prereset,
.hardreset = sas_ata_hard_reset,
},
.error_handler = ata_std_error_handler,
.post_internal_cmd = sas_ata_post_internal,
But it will bloat the code a bit (and elsewhere).
.error_handler = ata_std_error_handler,
.post_internal_cmd = sas_ata_post_internal,
.qc_defer = ata_std_qc_defer,
diff --git a/include/linux/libata.h b/include/linux/libata.h