ata: libata: Rename link flag ATA_LFLAG_NO_DB_DELAY

Rename the link flag ATA_LFLAG_NO_DB_DELAY to
ATA_LFLAG_NO_DEBOUNCE_DELAY. The new name is longer, but clearer.

Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/ahci_brcm.c b/drivers/ata/ahci_brcm.c
index ba695338927ad42969b930f72463564890a95ed8..64dd8aa397d5276b9cd917e9bf60a032e502f620 100644 (file)
--- a/drivers/ata/ahci_brcm.c
+++ b/drivers/ata/ahci_brcm.c
@@ -333,7 +333,7 @@ static struct ata_port_operations ahci_brcm_platform_ops = {
 
 static const struct ata_port_info ahci_brcm_port_info = {
        .flags          = AHCI_FLAG_COMMON | ATA_FLAG_NO_DIPM,
-       .link_flags     = ATA_LFLAG_NO_DB_DELAY,
+       .link_flags     = ATA_LFLAG_NO_DEBOUNCE_DELAY,
        .pio_mask       = ATA_PIO4,
        .udma_mask      = ATA_UDMA6,
        .port_ops       = &ahci_brcm_platform_ops,

diff --git a/drivers/ata/libata-sata.c b/drivers/ata/libata-sata.c
index bfe9595d4f3380e258d56fb4423fde49348eb566..071158c0c44c1d3e23ee41d133928b06f500fe1e 100644 (file)
--- a/drivers/ata/libata-sata.c
+++ b/drivers/ata/libata-sata.c
@@ -317,7 +317,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,
                 * immediately after resuming.  Delay 200ms before
                 * debouncing.
                 */
-               if (!(link->flags & ATA_LFLAG_NO_DB_DELAY))
+               if (!(link->flags & ATA_LFLAG_NO_DEBOUNCE_DELAY))
                        ata_msleep(link->ap, 200);
 
                /* is SControl restored correctly? */

diff --git a/include/linux/libata.h b/include/linux/libata.h
index bf706cd4567441d8c92293b8f99079fcc3b12f7c..605756f645bee8546c07489f8f86e922b77b7976 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -143,7 +143,7 @@ enum {
        ATA_LFLAG_NO_LPM        = (1 << 8), /* disable LPM on this link */
        ATA_LFLAG_RST_ONCE      = (1 << 9), /* limit recovery to one reset */
        ATA_LFLAG_CHANGED       = (1 << 10), /* LPM state changed on this link */
-       ATA_LFLAG_NO_DB_DELAY   = (1 << 11), /* no debounce delay on link resume */
+       ATA_LFLAG_NO_DEBOUNCE_DELAY = (1 << 11), /* no debounce delay on link resume */
 
        /* struct ata_port flags */
        ATA_FLAG_SLAVE_POSS     = (1 << 0), /* host supports slave dev */