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>

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 72abd2996e9c89872abae9135b7e897cd04984dd..bbf1318a2b9adee90c7b2dd6084699d8c408de0f 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -3510,7 +3510,7 @@ static int ata_dev_set_mode(struct ata_device *dev)
 }
 
 /**
- *     ata_do_set_mode - Program timings and issue SET FEATURES - XFER
+ *     ata_set_mode - Program timings and issue SET FEATURES - XFER
  *     @link: link on which timings will be programmed
  *     @r_failed_dev: out parameter for failed device
  *
@@ -3526,7 +3526,7 @@ static int ata_dev_set_mode(struct ata_device *dev)
  *     0 on success, negative errno otherwise
  */
 
-int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
+int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
 {
        struct ata_port *ap = link->ap;
        struct ata_device *dev;
@@ -3607,7 +3607,7 @@ int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev)
                *r_failed_dev = dev;
        return rc;
 }
-EXPORT_SYMBOL_GPL(ata_do_set_mode);
+EXPORT_SYMBOL_GPL(ata_set_mode);
 
 /**
  *     ata_wait_ready - wait for link to become ready

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 8b2a0a56ffe1f325d0274d34a81ed8c74b0804e1..e5fa61fb8a59d8d98641c0c727bc7a8da6728490 100644 (file)
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -3444,7 +3444,7 @@ static int ata_eh_set_mode(struct ata_link *link,
        if (ap->ops->set_mode)
                rc = ap->ops->set_mode(link, r_failed_dev);
        else
-               rc = ata_do_set_mode(link, r_failed_dev);
+               rc = ata_set_mode(link, r_failed_dev);
 
        /* if transfer mode has changed, set DUBIOUS_XFER on device */
        ata_for_each_dev(dev, link, ENABLED) {

diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c
index dfc36b4ec9c6b08087a4f62e960c799ad3496a6a..cc876dc7a9d8ec888cdd13c323760f25aa6ec95f 100644 (file)
--- a/drivers/ata/pata_optidma.c
+++ b/drivers/ata/pata_optidma.c
@@ -322,7 +322,9 @@ static int optidma_set_mode(struct ata_link *link, struct ata_device **r_failed)
        u8 r;
        int nybble = 4 * ap->port_no;
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
-       int rc  = ata_do_set_mode(link, r_failed);
+       int rc;
+
+       rc = ata_set_mode(link, r_failed);
        if (rc == 0) {
                pci_read_config_byte(pdev, 0x43, &r);
 

diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c
index 5b602206c52285e166e332404eaf5e6959c52dcd..cf3810933a27c13d6f9e6b96ef91092e5492bde4 100644 (file)
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
@@ -46,7 +46,7 @@ static int pcmcia_set_mode(struct ata_link *link, struct ata_device **r_failed_d
        struct ata_device *slave = &link->device[1];
 
        if (!ata_dev_enabled(master) || !ata_dev_enabled(slave))
-               return ata_do_set_mode(link, r_failed_dev);
+               return ata_set_mode(link, r_failed_dev);
 
        if (memcmp(master->id + ATA_ID_FW_REV,  slave->id + ATA_ID_FW_REV,
                           ATA_ID_FW_REV_LEN + ATA_ID_PROD_LEN) == 0) {
@@ -58,7 +58,7 @@ static int pcmcia_set_mode(struct ata_link *link, struct ata_device **r_failed_d
                        ata_dev_disable(slave);
                }
        }
-       return ata_do_set_mode(link, r_failed_dev);
+       return ata_set_mode(link, r_failed_dev);
 }
 
 /**

diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c
index 6820c5597b14580cbec11f619c691e0da71582bb..a4ee3b92c9aac8b6becfa5ee4c1dee7eaff3c9c0 100644 (file)
--- a/drivers/ata/pata_pdc2027x.c
+++ b/drivers/ata/pata_pdc2027x.c
@@ -387,7 +387,7 @@ static int pdc2027x_set_mode(struct ata_link *link, struct ata_device **r_failed
        struct ata_device *dev;
        int rc;
 
-       rc = ata_do_set_mode(link, r_failed);
+       rc = ata_set_mode(link, r_failed);
        if (rc < 0)
                return rc;
 

diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 3a99f66198a980b0b3408c8bce4c88cb72ace618..1b6dc950a42a3d04786f31fbc3f1b314757dd167 100644 (file)
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -351,7 +351,7 @@ static int sil_set_mode(struct ata_link *link, struct ata_device **r_failed)
        u32 tmp, dev_mode[2] = { };
        int rc;
 
-       rc = ata_do_set_mode(link, r_failed);
+       rc = ata_set_mode(link, r_failed);
        if (rc)
                return rc;
 

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 78a4addc6659cf94bd3dbbbf0b6f09798ceb3db5..d092747be5882714407ca3ff4ae85ee3bca8bd9f 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1218,7 +1218,7 @@ extern int ata_ncq_prio_enabled(struct ata_port *ap, struct scsi_device *sdev,
 extern int ata_ncq_prio_enable(struct ata_port *ap, struct scsi_device *sdev,
                               bool enable);
 extern struct ata_device *ata_dev_pair(struct ata_device *adev);
-extern int ata_do_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);
+int ata_set_mode(struct ata_link *link, struct ata_device **r_failed_dev);
 extern void ata_scsi_port_error_handler(struct Scsi_Host *host, struct ata_port *ap);
 extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port *ap, struct list_head *eh_q);