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

ata: sata_dwc_460ex: remove 'check_status' argument

Remove the 'check_status' argument from sata_dwc_qc_complete() and
sata_dwc_dma_xfer_complete() as it has no functionality.

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

authored by

Hannes Reinecke and committed by
Damien Le Moal d4caa905 898a276d

+13 -16
+13 -16
drivers/ata/sata_dwc_460ex.c
··· 182 182 * Prototypes 183 183 */ 184 184 static void sata_dwc_bmdma_start_by_tag(struct ata_queued_cmd *qc, u8 tag); 185 - static int sata_dwc_qc_complete(struct ata_port *ap, struct ata_queued_cmd *qc, 186 - u32 check_status); 187 - static void sata_dwc_dma_xfer_complete(struct ata_port *ap, u32 check_status); 185 + static int sata_dwc_qc_complete(struct ata_port *ap, struct ata_queued_cmd *qc); 186 + static void sata_dwc_dma_xfer_complete(struct ata_port *ap); 188 187 static void sata_dwc_clear_dmacr(struct sata_dwc_device_port *hsdevp, u8 tag); 189 188 190 189 #ifdef CONFIG_SATA_DWC_OLD_DMA ··· 323 324 } 324 325 325 326 if ((hsdevp->dma_interrupt_count % 2) == 0) 326 - sata_dwc_dma_xfer_complete(ap, 1); 327 + sata_dwc_dma_xfer_complete(ap); 327 328 328 329 spin_unlock_irqrestore(&host->lock, flags); 329 330 } ··· 555 556 556 557 if (status & ATA_ERR) { 557 558 dev_dbg(ap->dev, "interrupt ATA_ERR (0x%x)\n", status); 558 - sata_dwc_qc_complete(ap, qc, 1); 559 + sata_dwc_qc_complete(ap, qc); 559 560 handled = 1; 560 561 goto DONE; 561 562 } ··· 580 581 } 581 582 582 583 if ((hsdevp->dma_interrupt_count % 2) == 0) 583 - sata_dwc_dma_xfer_complete(ap, 1); 584 + sata_dwc_dma_xfer_complete(ap); 584 585 } else if (ata_is_pio(qc->tf.protocol)) { 585 586 ata_sff_hsm_move(ap, qc, status, 0); 586 587 handled = 1; 587 588 goto DONE; 588 589 } else { 589 - if (unlikely(sata_dwc_qc_complete(ap, qc, 1))) 590 + if (unlikely(sata_dwc_qc_complete(ap, qc))) 590 591 goto DRVSTILLBUSY; 591 592 } 592 593 ··· 646 647 if (status & ATA_ERR) { 647 648 dev_dbg(ap->dev, "%s ATA_ERR (0x%x)\n", __func__, 648 649 status); 649 - sata_dwc_qc_complete(ap, qc, 1); 650 + sata_dwc_qc_complete(ap, qc); 650 651 handled = 1; 651 652 goto DONE; 652 653 } ··· 661 662 dev_warn(ap->dev, "%s: DMA not pending?\n", 662 663 __func__); 663 664 if ((hsdevp->dma_interrupt_count % 2) == 0) 664 - sata_dwc_dma_xfer_complete(ap, 1); 665 + sata_dwc_dma_xfer_complete(ap); 665 666 } else { 666 - if (unlikely(sata_dwc_qc_complete(ap, qc, 1))) 667 + if (unlikely(sata_dwc_qc_complete(ap, qc))) 667 668 goto STILLBUSY; 668 669 } 669 670 continue; ··· 718 719 } 719 720 } 720 721 721 - static void sata_dwc_dma_xfer_complete(struct ata_port *ap, u32 check_status) 722 + static void sata_dwc_dma_xfer_complete(struct ata_port *ap) 722 723 { 723 724 struct ata_queued_cmd *qc; 724 725 struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap); ··· 741 742 } 742 743 743 744 hsdevp->dma_pending[tag] = SATA_DWC_DMA_PENDING_NONE; 744 - sata_dwc_qc_complete(ap, qc, check_status); 745 + sata_dwc_qc_complete(ap, qc); 745 746 ap->link.active_tag = ATA_TAG_POISON; 746 747 } else { 747 - sata_dwc_qc_complete(ap, qc, check_status); 748 + sata_dwc_qc_complete(ap, qc); 748 749 } 749 750 } 750 751 751 - static int sata_dwc_qc_complete(struct ata_port *ap, struct ata_queued_cmd *qc, 752 - u32 check_status) 752 + static int sata_dwc_qc_complete(struct ata_port *ap, struct ata_queued_cmd *qc) 753 753 { 754 754 u8 status = 0; 755 755 u32 mask = 0x0; ··· 756 758 struct sata_dwc_device *hsdev = HSDEV_FROM_AP(ap); 757 759 struct sata_dwc_device_port *hsdevp = HSDEVP_FROM_AP(ap); 758 760 hsdev->sactive_queued = 0; 759 - dev_dbg(ap->dev, "%s checkstatus? %x\n", __func__, check_status); 760 761 761 762 if (hsdevp->dma_pending[tag] == SATA_DWC_DMA_PENDING_TX) 762 763 dev_err(ap->dev, "TX DMA PENDING\n");