treewide: devm_kzalloc() -> devm_kcalloc()

[mirror_ubuntu-jammy-kernel.git] / drivers / ata / sata_mv.c

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 42d4589b43d406ce439d975993190694e8ba5406..73ba8e134ca9a9054867ae4e32581f9cc825539d 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1802,7 +1802,7 @@ static void mv_fill_sg(struct ata_queued_cmd *qc)
        struct mv_sg *mv_sg, *last_sg = NULL;
        unsigned int si;
 
-       mv_sg = pp->sg_tbl[qc->tag];
+       mv_sg = pp->sg_tbl[qc->hw_tag];
        for_each_sg(qc->sg, sg, qc->n_elem, si) {
                dma_addr_t addr = sg_dma_address(sg);
                u32 sg_len = sg_dma_len(sg);
@@ -1903,9 +1903,9 @@ static void mv_bmdma_setup(struct ata_queued_cmd *qc)
        writel(0, port_mmio + BMDMA_CMD);
 
        /* load PRD table addr. */
-       writel((pp->sg_tbl_dma[qc->tag] >> 16) >> 16,
+       writel((pp->sg_tbl_dma[qc->hw_tag] >> 16) >> 16,
                port_mmio + BMDMA_PRD_HIGH);
-       writelfl(pp->sg_tbl_dma[qc->tag],
+       writelfl(pp->sg_tbl_dma[qc->hw_tag],
                port_mmio + BMDMA_PRD_LOW);
 
        /* issue r/w command */
@@ -2071,17 +2071,17 @@ static void mv_qc_prep(struct ata_queued_cmd *qc)
         */
        if (!(tf->flags & ATA_TFLAG_WRITE))
                flags |= CRQB_FLAG_READ;
-       WARN_ON(MV_MAX_Q_DEPTH <= qc->tag);
-       flags |= qc->tag << CRQB_TAG_SHIFT;
+       WARN_ON(MV_MAX_Q_DEPTH <= qc->hw_tag);
+       flags |= qc->hw_tag << CRQB_TAG_SHIFT;
        flags |= (qc->dev->link->pmp & 0xf) << CRQB_PMP_SHIFT;
 
        /* get current queue index from software */
        in_index = pp->req_idx;
 
        pp->crqb[in_index].sg_addr =
-               cpu_to_le32(pp->sg_tbl_dma[qc->tag] & 0xffffffff);
+               cpu_to_le32(pp->sg_tbl_dma[qc->hw_tag] & 0xffffffff);
        pp->crqb[in_index].sg_addr_hi =
-               cpu_to_le32((pp->sg_tbl_dma[qc->tag] >> 16) >> 16);
+               cpu_to_le32((pp->sg_tbl_dma[qc->hw_tag] >> 16) >> 16);
        pp->crqb[in_index].ctrl_flags = cpu_to_le16(flags);
 
        cw = &pp->crqb[in_index].ata_cmd[0];
@@ -2164,17 +2164,17 @@ static void mv_qc_prep_iie(struct ata_queued_cmd *qc)
        if (!(tf->flags & ATA_TFLAG_WRITE))
                flags |= CRQB_FLAG_READ;
 
-       WARN_ON(MV_MAX_Q_DEPTH <= qc->tag);
-       flags |= qc->tag << CRQB_TAG_SHIFT;
-       flags |= qc->tag << CRQB_HOSTQ_SHIFT;
+       WARN_ON(MV_MAX_Q_DEPTH <= qc->hw_tag);
+       flags |= qc->hw_tag << CRQB_TAG_SHIFT;
+       flags |= qc->hw_tag << CRQB_HOSTQ_SHIFT;
        flags |= (qc->dev->link->pmp & 0xf) << CRQB_PMP_SHIFT;
 
        /* get current queue index from software */
        in_index = pp->req_idx;
 
        crqb = (struct mv_crqb_iie *) &pp->crqb[in_index];
-       crqb->addr = cpu_to_le32(pp->sg_tbl_dma[qc->tag] & 0xffffffff);
-       crqb->addr_hi = cpu_to_le32((pp->sg_tbl_dma[qc->tag] >> 16) >> 16);
+       crqb->addr = cpu_to_le32(pp->sg_tbl_dma[qc->hw_tag] & 0xffffffff);
+       crqb->addr_hi = cpu_to_le32((pp->sg_tbl_dma[qc->hw_tag] >> 16) >> 16);
        crqb->flags = cpu_to_le32(flags);
 
        crqb->ata_cmd[0] = cpu_to_le32(
@@ -2539,7 +2539,7 @@ static int mv_handle_fbs_ncq_dev_err(struct ata_port *ap)
        failed_links = hweight16(new_map);
 
        ata_port_info(ap,
-                     "%s: pmp_map=%04x qc_map=%04x failed_links=%d nr_active_links=%d\n",
+                     "%s: pmp_map=%04x qc_map=%04llx failed_links=%d nr_active_links=%d\n",
                      __func__, pp->delayed_eh_pmp_map,
                      ap->qc_active, failed_links,
                      ap->nr_active_links);
@@ -4114,13 +4114,13 @@ static int mv_platform_probe(struct platform_device *pdev)
 
        if (!host || !hpriv)
                return -ENOMEM;
-       hpriv->port_clks = devm_kzalloc(&pdev->dev,
-                                       sizeof(struct clk *) * n_ports,
+       hpriv->port_clks = devm_kcalloc(&pdev->dev,
+                                       n_ports, sizeof(struct clk *),
                                        GFP_KERNEL);
        if (!hpriv->port_clks)
                return -ENOMEM;
-       hpriv->port_phys = devm_kzalloc(&pdev->dev,
-                                       sizeof(struct phy *) * n_ports,
+       hpriv->port_phys = devm_kcalloc(&pdev->dev,
+                                       n_ports, sizeof(struct phy *),
                                        GFP_KERNEL);
        if (!hpriv->port_phys)
                return -ENOMEM;