Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ata: libata-core: Rename ata_do_set_mode()

With the renaming of libata-eh ata_set_mode() function to
ata_eh_set_mode(), libata-core function ata_do_set_mode() can now be
renamed to the simpler ata_set_mode().

All the call sites of the former ata_do_set_mode() are updated to use
the new function name.

No functional changes.

Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Reviewed-by: Niklas Cassel <cassel@kernel.org>
Link: https://lore.kernel.org/r/20250703103622.291272-5-dlemoal@kernel.org
Signed-off-by: Niklas Cassel <cassel@kernel.org>

authored by

Damien Le Moal and committed by
Niklas Cassel
31921e87 6ba4d05c

+12 -10
+3 -3
drivers/ata/libata-core.c
··· 3510 3510 } 3511 3511 3512 3512 /** 3513 - * ata_do_set_mode - Program timings and issue SET FEATURES - XFER 3513 + * ata_set_mode - Program timings and issue SET FEATURES - XFER 3514 3514 * @link: link on which timings will be programmed 3515 3515 * @r_failed_dev: out parameter for failed device 3516 3516 * ··· 3526 3526 * 0 on success, negative errno otherwise 3527 3527 */ 3528 3528 3529 - int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) 3529 + int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev) 3530 3530 { 3531 3531 struct ata_port *ap = link->ap; 3532 3532 struct ata_device *dev; ··· 3607 3607 *r_failed_dev = dev; 3608 3608 return rc; 3609 3609 } 3610 - EXPORT_SYMBOL_GPL(ata_do_set_mode); 3610 + EXPORT_SYMBOL_GPL(ata_set_mode); 3611 3611 3612 3612 /** 3613 3613 * ata_wait_ready - wait for link to become ready
+1 -1
drivers/ata/libata-eh.c
··· 3444 3444 if (ap->ops->set_mode) 3445 3445 rc = ap->ops->set_mode(link, r_failed_dev); 3446 3446 else 3447 - rc = ata_do_set_mode(link, r_failed_dev); 3447 + rc = ata_set_mode(link, r_failed_dev); 3448 3448 3449 3449 /* if transfer mode has changed, set DUBIOUS_XFER on device */ 3450 3450 ata_for_each_dev(dev, link, ENABLED) {
+3 -1
drivers/ata/pata_optidma.c
··· 322 322 u8 r; 323 323 int nybble = 4 * ap->port_no; 324 324 struct pci_dev *pdev = to_pci_dev(ap->host->dev); 325 - int rc = ata_do_set_mode(link, r_failed); 325 + int rc; 326 + 327 + rc = ata_set_mode(link, r_failed); 326 328 if (rc == 0) { 327 329 pci_read_config_byte(pdev, 0x43, &r); 328 330
+2 -2
drivers/ata/pata_pcmcia.c
··· 46 46 struct ata_device *slave = &link->device[1]; 47 47 48 48 if (!ata_dev_enabled(master) || !ata_dev_enabled(slave)) 49 - return ata_do_set_mode(link, r_failed_dev); 49 + return ata_set_mode(link, r_failed_dev); 50 50 51 51 if (memcmp(master->id + ATA_ID_FW_REV, slave->id + ATA_ID_FW_REV, 52 52 ATA_ID_FW_REV_LEN + ATA_ID_PROD_LEN) == 0) { ··· 58 58 ata_dev_disable(slave); 59 59 } 60 60 } 61 - return ata_do_set_mode(link, r_failed_dev); 61 + return ata_set_mode(link, r_failed_dev); 62 62 } 63 63 64 64 /**
+1 -1
drivers/ata/pata_pdc2027x.c
··· 387 387 struct ata_device *dev; 388 388 int rc; 389 389 390 - rc = ata_do_set_mode(link, r_failed); 390 + rc = ata_set_mode(link, r_failed); 391 391 if (rc < 0) 392 392 return rc; 393 393
+1 -1
drivers/ata/sata_sil.c
··· 351 351 u32 tmp, dev_mode[2] = { }; 352 352 int rc; 353 353 354 - rc = ata_do_set_mode(link, r_failed); 354 + rc = ata_set_mode(link, r_failed); 355 355 if (rc) 356 356 return rc; 357 357
+1 -1
include/linux/libata.h
··· 1218 1218 extern int ata_ncq_prio_enable(struct ata_port *ap, struct scsi_device *sdev, 1219 1219 bool enable); 1220 1220 extern struct ata_device *ata_dev_pair(struct ata_device *adev); 1221 - extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev); 1221 + int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev); 1222 1222 extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap); 1223 1223 extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, struct list_head *eh_q); 1224 1224