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

libata: switch remaining drivers to use dma_set_mask_and_coherent

Use dma_set_mask_and_coherent instead of separate dma_set_mask and
dma_set_coherent_mask calls.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Hellwig and committed by
Jens Axboe b5e55556 dcc02c19

+14 -70
+1 -7
drivers/ata/libata-sff.c
··· 3147 3147 * ->sff_irq_clear method. Try to initialize bmdma_addr 3148 3148 * regardless of dma masks. 3149 3149 */ 3150 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 3150 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 3151 3151 if (rc) 3152 3152 ata_bmdma_nodma(host, "failed to set dma mask"); 3153 - if (!rc) { 3154 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 3155 - if (rc) 3156 - ata_bmdma_nodma(host, 3157 - "failed to set consistent dma mask"); 3158 - } 3159 3153 3160 3154 /* request and iomap DMA region */ 3161 3155 rc = pcim_iomap_regions(pdev, 1 << 4, dev_driver_string(gdev));
+1 -6
drivers/ata/pata_atp867x.c
··· 463 463 464 464 atp867x_fixup(host); 465 465 466 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 467 - if (rc) 468 - return rc; 469 - 470 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 471 - return rc; 466 + return dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 472 467 } 473 468 474 469 static int atp867x_init_one(struct pci_dev *pdev,
+1 -5
drivers/ata/pata_cs5520.c
··· 155 155 return -ENODEV; 156 156 } 157 157 158 - if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) { 158 + if (dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32))) { 159 159 printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n"); 160 - return -ENODEV; 161 - } 162 - if (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32))) { 163 - printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n"); 164 160 return -ENODEV; 165 161 } 166 162
+1 -4
drivers/ata/pata_hpt3x3.c
··· 221 221 if (rc) 222 222 return rc; 223 223 host->iomap = pcim_iomap_table(pdev); 224 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 225 - if (rc) 226 - return rc; 227 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 224 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 228 225 if (rc) 229 226 return rc; 230 227
+1 -4
drivers/ata/pata_ninja32.c
··· 123 123 return rc; 124 124 125 125 host->iomap = pcim_iomap_table(dev); 126 - rc = dma_set_mask(&dev->dev, ATA_DMA_MASK); 127 - if (rc) 128 - return rc; 129 - rc = dma_set_coherent_mask(&dev->dev, ATA_DMA_MASK); 126 + rc = dma_set_mask_and_coherent(&dev->dev, ATA_DMA_MASK); 130 127 if (rc) 131 128 return rc; 132 129 pci_set_master(dev);
+1 -5
drivers/ata/pata_pdc2027x.c
··· 722 722 return rc; 723 723 host->iomap = pcim_iomap_table(pdev); 724 724 725 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 726 - if (rc) 727 - return rc; 728 - 729 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 725 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 730 726 if (rc) 731 727 return rc; 732 728
+1 -4
drivers/ata/pata_sil680.c
··· 374 374 host->iomap = pcim_iomap_table(pdev); 375 375 376 376 /* Setup DMA masks */ 377 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 378 - if (rc) 379 - return rc; 380 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 377 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 381 378 if (rc) 382 379 return rc; 383 380 pci_set_master(pdev);
+1 -7
drivers/ata/sata_inic162x.c
··· 862 862 } 863 863 864 864 /* Set dma_mask. This devices doesn't support 64bit addressing. */ 865 - rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); 865 + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); 866 866 if (rc) { 867 867 dev_err(&pdev->dev, "32-bit DMA enable failed\n"); 868 - return rc; 869 - } 870 - 871 - rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); 872 - if (rc) { 873 - dev_err(&pdev->dev, "32-bit consistent DMA enable failed\n"); 874 868 return rc; 875 869 } 876 870
+1 -4
drivers/ata/sata_promise.c
··· 1230 1230 /* initialize adapter */ 1231 1231 pdc_host_init(host); 1232 1232 1233 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 1234 - if (rc) 1235 - return rc; 1236 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 1233 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 1237 1234 if (rc) 1238 1235 return rc; 1239 1236
+1 -4
drivers/ata/sata_sil.c
··· 757 757 return rc; 758 758 host->iomap = pcim_iomap_table(pdev); 759 759 760 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 761 - if (rc) 762 - return rc; 763 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 760 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 764 761 if (rc) 765 762 return rc; 766 763
+1 -4
drivers/ata/sata_svw.c
··· 471 471 ata_port_pbar_desc(ap, 5, offset, "port"); 472 472 } 473 473 474 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 475 - if (rc) 476 - return rc; 477 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 474 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 478 475 if (rc) 479 476 return rc; 480 477
+1 -4
drivers/ata/sata_sx4.c
··· 1470 1470 } 1471 1471 1472 1472 /* configure and activate */ 1473 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 1474 - if (rc) 1475 - return rc; 1476 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 1473 + rc = dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 1477 1474 if (rc) 1478 1475 return rc; 1479 1476
+1 -8
drivers/ata/sata_via.c
··· 505 505 for (i = 0; i < host->n_ports; i++) 506 506 vt6421_init_addrs(host->ports[i]); 507 507 508 - rc = dma_set_mask(&pdev->dev, ATA_DMA_MASK); 509 - if (rc) 510 - return rc; 511 - rc = dma_set_coherent_mask(&pdev->dev, ATA_DMA_MASK); 512 - if (rc) 513 - return rc; 514 - 515 - return 0; 508 + return dma_set_mask_and_coherent(&pdev->dev, ATA_DMA_MASK); 516 509 } 517 510 518 511 static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host)
+1 -4
drivers/ata/sata_vsc.c
··· 371 371 /* 372 372 * Use 32 bit DMA mask, because 64 bit address support is poor. 373 373 */ 374 - rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); 375 - if (rc) 376 - return rc; 377 - rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); 374 + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); 378 375 if (rc) 379 376 return rc; 380 377