aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ahci.c6
-rw-r--r--drivers/ata/pata_cs5520.c4
-rw-r--r--drivers/ata/pata_ixp4xx_cf.c2
-rw-r--r--drivers/ata/pdc_adma.c4
-rw-r--r--drivers/ata/sata_inic162x.c4
-rw-r--r--drivers/ata/sata_mv.c6
-rw-r--r--drivers/ata/sata_qstor.c6
-rw-r--r--drivers/ata/sata_sil24.c6
-rw-r--r--drivers/ata/sata_vsc.c4
9 files changed, 21 insertions, 21 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 207d775c3c27..f75dac57dc2b 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -2408,7 +2408,7 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
2408 !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { 2408 !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
2409 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); 2409 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
2410 if (rc) { 2410 if (rc) {
2411 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 2411 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
2412 if (rc) { 2412 if (rc) {
2413 dev_printk(KERN_ERR, &pdev->dev, 2413 dev_printk(KERN_ERR, &pdev->dev,
2414 "64-bit DMA enable failed\n"); 2414 "64-bit DMA enable failed\n");
@@ -2416,13 +2416,13 @@ static int ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)
2416 } 2416 }
2417 } 2417 }
2418 } else { 2418 } else {
2419 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 2419 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
2420 if (rc) { 2420 if (rc) {
2421 dev_printk(KERN_ERR, &pdev->dev, 2421 dev_printk(KERN_ERR, &pdev->dev,
2422 "32-bit DMA enable failed\n"); 2422 "32-bit DMA enable failed\n");
2423 return rc; 2423 return rc;
2424 } 2424 }
2425 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 2425 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
2426 if (rc) { 2426 if (rc) {
2427 dev_printk(KERN_ERR, &pdev->dev, 2427 dev_printk(KERN_ERR, &pdev->dev,
2428 "32-bit consistent DMA enable failed\n"); 2428 "32-bit consistent DMA enable failed\n");
diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c
index db6a96984f3f..0df83cf74233 100644
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
@@ -203,11 +203,11 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi
203 return -ENODEV; 203 return -ENODEV;
204 } 204 }
205 205
206 if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { 206 if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) {
207 printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n"); 207 printk(KERN_ERR DRV_NAME ": unable to configure DMA mask.\n");
208 return -ENODEV; 208 return -ENODEV;
209 } 209 }
210 if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) { 210 if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {
211 printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n"); 211 printk(KERN_ERR DRV_NAME ": unable to configure consistent DMA mask.\n");
212 return -ENODEV; 212 return -ENODEV;
213 } 213 }
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c
index 19fdecf319a6..ba54b089f98c 100644
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -157,7 +157,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)
157 return -ENOMEM; 157 return -ENOMEM;
158 158
159 /* acquire resources and fill host */ 159 /* acquire resources and fill host */
160 pdev->dev.coherent_dma_mask = DMA_32BIT_MASK; 160 pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
161 161
162 data->cs0 = devm_ioremap(&pdev->dev, cs0->start, 0x1000); 162 data->cs0 = devm_ioremap(&pdev->dev, cs0->start, 0x1000);
163 data->cs1 = devm_ioremap(&pdev->dev, cs1->start, 0x1000); 163 data->cs1 = devm_ioremap(&pdev->dev, cs1->start, 0x1000);
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c
index 39588178d028..6c65b0776a2c 100644
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
@@ -607,13 +607,13 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
607{ 607{
608 int rc; 608 int rc;
609 609
610 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 610 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
611 if (rc) { 611 if (rc) {
612 dev_printk(KERN_ERR, &pdev->dev, 612 dev_printk(KERN_ERR, &pdev->dev,
613 "32-bit DMA enable failed\n"); 613 "32-bit DMA enable failed\n");
614 return rc; 614 return rc;
615 } 615 }
616 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 616 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
617 if (rc) { 617 if (rc) {
618 dev_printk(KERN_ERR, &pdev->dev, 618 dev_printk(KERN_ERR, &pdev->dev,
619 "32-bit consistent DMA enable failed\n"); 619 "32-bit consistent DMA enable failed\n");
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 305a4f825f53..8d890cc5a7ee 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -861,14 +861,14 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
861 } 861 }
862 862
863 /* Set dma_mask. This devices doesn't support 64bit addressing. */ 863 /* Set dma_mask. This devices doesn't support 64bit addressing. */
864 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 864 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
865 if (rc) { 865 if (rc) {
866 dev_printk(KERN_ERR, &pdev->dev, 866 dev_printk(KERN_ERR, &pdev->dev,
867 "32-bit DMA enable failed\n"); 867 "32-bit DMA enable failed\n");
868 return rc; 868 return rc;
869 } 869 }
870 870
871 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 871 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
872 if (rc) { 872 if (rc) {
873 dev_printk(KERN_ERR, &pdev->dev, 873 dev_printk(KERN_ERR, &pdev->dev,
874 "32-bit consistent DMA enable failed\n"); 874 "32-bit consistent DMA enable failed\n");
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 45e0fe191afc..5af3ea19d3c5 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -3916,7 +3916,7 @@ static int pci_go_64(struct pci_dev *pdev)
3916 if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { 3916 if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
3917 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); 3917 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
3918 if (rc) { 3918 if (rc) {
3919 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 3919 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
3920 if (rc) { 3920 if (rc) {
3921 dev_printk(KERN_ERR, &pdev->dev, 3921 dev_printk(KERN_ERR, &pdev->dev,
3922 "64-bit DMA enable failed\n"); 3922 "64-bit DMA enable failed\n");
@@ -3924,13 +3924,13 @@ static int pci_go_64(struct pci_dev *pdev)
3924 } 3924 }
3925 } 3925 }
3926 } else { 3926 } else {
3927 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 3927 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
3928 if (rc) { 3928 if (rc) {
3929 dev_printk(KERN_ERR, &pdev->dev, 3929 dev_printk(KERN_ERR, &pdev->dev,
3930 "32-bit DMA enable failed\n"); 3930 "32-bit DMA enable failed\n");
3931 return rc; 3931 return rc;
3932 } 3932 }
3933 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 3933 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
3934 if (rc) { 3934 if (rc) {
3935 dev_printk(KERN_ERR, &pdev->dev, 3935 dev_printk(KERN_ERR, &pdev->dev,
3936 "32-bit consistent DMA enable failed\n"); 3936 "32-bit consistent DMA enable failed\n");
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c
index 7b37c27d7972..326c0cfc29b3 100644
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
@@ -587,7 +587,7 @@ static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
587 !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { 587 !pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
588 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); 588 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
589 if (rc) { 589 if (rc) {
590 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 590 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
591 if (rc) { 591 if (rc) {
592 dev_printk(KERN_ERR, &pdev->dev, 592 dev_printk(KERN_ERR, &pdev->dev,
593 "64-bit DMA enable failed\n"); 593 "64-bit DMA enable failed\n");
@@ -595,13 +595,13 @@ static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)
595 } 595 }
596 } 596 }
597 } else { 597 } else {
598 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 598 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
599 if (rc) { 599 if (rc) {
600 dev_printk(KERN_ERR, &pdev->dev, 600 dev_printk(KERN_ERR, &pdev->dev,
601 "32-bit DMA enable failed\n"); 601 "32-bit DMA enable failed\n");
602 return rc; 602 return rc;
603 } 603 }
604 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 604 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
605 if (rc) { 605 if (rc) {
606 dev_printk(KERN_ERR, &pdev->dev, 606 dev_printk(KERN_ERR, &pdev->dev,
607 "32-bit consistent DMA enable failed\n"); 607 "32-bit consistent DMA enable failed\n");
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 37730bc2f09f..77aa8d7ecec4 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -1300,7 +1300,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1300 if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) { 1300 if (!pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) {
1301 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)); 1301 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
1302 if (rc) { 1302 if (rc) {
1303 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 1303 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
1304 if (rc) { 1304 if (rc) {
1305 dev_printk(KERN_ERR, &pdev->dev, 1305 dev_printk(KERN_ERR, &pdev->dev,
1306 "64-bit DMA enable failed\n"); 1306 "64-bit DMA enable failed\n");
@@ -1308,13 +1308,13 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
1308 } 1308 }
1309 } 1309 }
1310 } else { 1310 } else {
1311 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 1311 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
1312 if (rc) { 1312 if (rc) {
1313 dev_printk(KERN_ERR, &pdev->dev, 1313 dev_printk(KERN_ERR, &pdev->dev,
1314 "32-bit DMA enable failed\n"); 1314 "32-bit DMA enable failed\n");
1315 return rc; 1315 return rc;
1316 } 1316 }
1317 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 1317 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
1318 if (rc) { 1318 if (rc) {
1319 dev_printk(KERN_ERR, &pdev->dev, 1319 dev_printk(KERN_ERR, &pdev->dev,
1320 "32-bit consistent DMA enable failed\n"); 1320 "32-bit consistent DMA enable failed\n");
diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c
index ed70bd28fa2c..8b2a278b2547 100644
--- a/drivers/ata/sata_vsc.c
+++ b/drivers/ata/sata_vsc.c
@@ -399,10 +399,10 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev,
399 /* 399 /*
400 * Use 32 bit DMA mask, because 64 bit address support is poor. 400 * Use 32 bit DMA mask, because 64 bit address support is poor.
401 */ 401 */
402 rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 402 rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
403 if (rc) 403 if (rc)
404 return rc; 404 return rc;
405 rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 405 rc = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
406 if (rc) 406 if (rc)
407 return rc; 407 return rc;
408 408
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-16 22:38:24 -0500