ata: libata: remove pointless debugging messages

Debugging messages in pci init functions or sg setup are pretty
much pointless, as the workflow pretty much decides what happened.
So drop them.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>

diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c
index 2a04e8abd3977ddbd677bbcd172e9311a8759dc2..536d4cb8f08b2443f5fb74c9672ff9a54ff3da92 100644 (file)
--- a/drivers/ata/acard-ahci.c
+++ b/drivers/ata/acard-ahci.c
@@ -185,8 +185,6 @@ static unsigned int acard_ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl)
        struct acard_sg *acard_sg = cmd_tbl + AHCI_CMD_TBL_HDR_SZ;
        unsigned int si, last_si = 0;
 
-       VPRINTK("ENTER\n");
-
        /*
         * Next, the S/G list.
         */
@@ -362,8 +360,6 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_id
        struct ata_host *host;
        int n_ports, i, rc;
 
-       VPRINTK("ENTER\n");
-
        WARN_ON((int)ATA_MAX_QUEUE > AHCI_MAX_CMDS);
 
        ata_print_version_once(&pdev->dev, DRV_VERSION);

diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 98d04a78045850aa92affe8a6bd140a432346f6f..d5bed24a52baff101077f46f0cdde3475b51707e 100644 (file)
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -1673,8 +1673,6 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
        int n_ports, i, rc;
        int ahci_pci_bar = AHCI_PCI_BAR_STANDARD;
 
-       VPRINTK("ENTER\n");
-
        WARN_ON((int)ATA_MAX_QUEUE > AHCI_MAX_CMDS);
 
        ata_print_version_once(&pdev->dev, DRV_VERSION);

diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index 0b2fcf0d1d6c4760ef002b229d60a52e1afaaf44..eb6bf30bd2e30e3699f18f3d1cf1219b647c5b40 100644 (file)
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -1345,7 +1345,6 @@ static void piix_init_pcs(struct ata_host *host,
        new_pcs = pcs | map_db->port_enable;
 
        if (new_pcs != pcs) {
-               DPRINTK("updating PCS from 0x%x to 0x%x\n", pcs, new_pcs);
                pci_write_config_word(pdev, ICH5_PCS, new_pcs);
                msleep(150);
        }
@@ -1769,14 +1768,12 @@ static int __init piix_init(void)
 {
        int rc;
 
-       DPRINTK("pci_register_driver\n");
        rc = pci_register_driver(&piix_pci_driver);
        if (rc)
                return rc;
 
        in_module_init = 0;
 
-       DPRINTK("done\n");
        return 0;
 }
 

diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c
index f76b8418e6fb10b05dbc90439c87d7999b07508b..94edbc89a48c61b7cb1963365d8a2d497e706967 100644 (file)
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
@@ -1620,8 +1620,6 @@ static unsigned int ahci_fill_sg(struct ata_queued_cmd *qc, void *cmd_tbl)
        struct ahci_sg *ahci_sg = cmd_tbl + AHCI_CMD_TBL_HDR_SZ;
        unsigned int si;
 
-       VPRINTK("ENTER\n");
-
        /*
         * Next, the S/G list.
         */
@@ -1695,7 +1693,6 @@ static void ahci_fbs_dec_intr(struct ata_port *ap)
        u32 fbs = readl(port_mmio + PORT_FBS);
        int retries = 3;
 
-       DPRINTK("ENTER\n");
        BUG_ON(!pp->fbs_enabled);
 
        /* time to wait for DEC is not specified by AHCI spec,

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index aba0c67d1bd6563d34250e4b8b11114612e91dcf..72f56c32fe833f80f0b15ab283200ba1865f3e2d 100644 (file)
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -764,9 +764,6 @@ int ata_build_rw_tf(struct ata_taskfile *tf, struct ata_device *dev,
                head  = track % dev->heads;
                sect  = (u32)block % dev->sectors + 1;
 
-               DPRINTK("block %u track %u cyl %u head %u sect %u\n",
-                       (u32)block, track, cyl, head, sect);
-
                /* Check whether the converted CHS can fit.
                   Cylinder: 0-65535
                   Head: 0-15
@@ -4569,8 +4566,6 @@ static int ata_sg_setup(struct ata_queued_cmd *qc)
        struct ata_port *ap = qc->ap;
        unsigned int n_elem;
 
-       VPRINTK("ENTER, ata%u\n", ap->print_id);
-
        n_elem = dma_map_sg(ap->dev, qc->sg, qc->n_elem, qc->dma_dir);
        if (n_elem < 1)
                return -1;
@@ -5375,8 +5370,6 @@ struct ata_port *ata_port_alloc(struct ata_host *host)
 {
        struct ata_port *ap;
 
-       DPRINTK("ENTER\n");
-
        ap = kzalloc(sizeof(*ap), GFP_KERNEL);
        if (!ap)
                return NULL;
@@ -5493,8 +5486,6 @@ struct ata_host *ata_host_alloc(struct device *dev, int max_ports)
        int i;
        void *dr;
 
-       DPRINTK("ENTER\n");
-
        /* alloc a container for our list of ATA ports (buses) */
        sz = sizeof(struct ata_host) + (max_ports + 1) * sizeof(void *);
        host = kzalloc(sz, GFP_KERNEL);
@@ -5784,9 +5775,7 @@ int ata_port_probe(struct ata_port *ap)
                __ata_port_probe(ap);
                ata_port_wait_eh(ap);
        } else {
-               DPRINTK("ata%u: bus probe begin\n", ap->print_id);
                rc = ata_bus_probe(ap);
-               DPRINTK("ata%u: bus probe end\n", ap->print_id);
        }
        return rc;
 }

diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
index b71ea4a680b01285e1d30f39c203e3aa50696c2d..39c026f3948c2d4ee66d7777b33f0e68a4ea3d8a 100644 (file)
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
@@ -2467,8 +2467,6 @@ static int ata_pci_init_one(struct pci_dev *pdev,
        struct ata_host *host = NULL;
        int rc;
 
-       DPRINTK("ENTER\n");
-
        pi = ata_sff_find_valid_pi(ppi);
        if (!pi) {
                dev_err(&pdev->dev, "no valid port_info specified\n");

diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c
index 16272c1112085ab52ed638cb7d7c0907505fbbf2..3c70405a0b8002d4e708f6c5aaf56084e27fd56e 100644 (file)
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
@@ -1277,8 +1277,6 @@ static int nv_adma_host_init(struct ata_host *host)
        unsigned int i;
        u32 tmp32;
 
-       VPRINTK("ENTER\n");
-
        /* enable ADMA on the ports */
        pci_read_config_dword(pdev, NV_MCP_SATA_CFG_20, &tmp32);
        tmp32 |= NV_MCP_SATA_CFG_20_PORT0_EN |
@@ -1320,8 +1318,6 @@ static void nv_adma_fill_sg(struct ata_queued_cmd *qc, struct nv_adma_cpb *cpb)
        struct scatterlist *sg;
        unsigned int si;
 
-       VPRINTK("ENTER\n");
-
        for_each_sg(qc->sg, sg, qc->n_elem, si) {
                aprd = (si < 5) ? &cpb->aprd[si] :
                        &pp->aprd[NV_ADMA_SGTBL_LEN * qc->hw_tag + (si-5)];