projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'trace-4.1-tracefs' of git://git.kernel.org/pub/scm/linux/kernel/git/rosted...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
ata
/
sata_sil24.c
diff --git
a/drivers/ata/sata_sil24.c
b/drivers/ata/sata_sil24.c
index ba2667fa0528ff1f2138c438bfe72d10c6757c87..4b1995e2d044ba7e4da5f6e36ec0c2d2dedafd50 100644
(file)
--- a/
drivers/ata/sata_sil24.c
+++ b/
drivers/ata/sata_sil24.c
@@
-246,7
+246,7
@@
enum {
/* host flags */
SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA |
ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA |
/* host flags */
SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA |
ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA |
- ATA_FLAG_AN | ATA_FLAG_PMP
| ATA_FLAG_LOWTAG
,
+ ATA_FLAG_AN | ATA_FLAG_PMP,
SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */
IRQ_STAT_4PORTS = 0xf,
SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */
IRQ_STAT_4PORTS = 0xf,
@@
-1312,10
+1312,10
@@
static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
host->iomap = iomap;
/* configure and activate the device */
host->iomap = iomap;
/* configure and activate the device */
- if (!
pci_set_dma_mask(p
dev, DMA_BIT_MASK(64))) {
- rc =
pci_set_consistent_dma_mask(p
dev, DMA_BIT_MASK(64));
+ if (!
dma_set_mask(&pdev->
dev, DMA_BIT_MASK(64))) {
+ rc =
dma_set_coherent_mask(&pdev->
dev, DMA_BIT_MASK(64));
if (rc) {
if (rc) {
- rc =
pci_set_consistent_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_coherent_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev,
"64-bit DMA enable failed\n");
if (rc) {
dev_err(&pdev->dev,
"64-bit DMA enable failed\n");
@@
-1323,12
+1323,12
@@
static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
}
}
} else {
}
}
} else {
- rc =
pci_set_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev, "32-bit DMA enable failed\n");
return rc;
}
if (rc) {
dev_err(&pdev->dev, "32-bit DMA enable failed\n");
return rc;
}
- rc =
pci_set_consistent_dma_mask(p
dev, DMA_BIT_MASK(32));
+ rc =
dma_set_coherent_mask(&pdev->
dev, DMA_BIT_MASK(32));
if (rc) {
dev_err(&pdev->dev,
"32-bit consistent DMA enable failed\n");
if (rc) {
dev_err(&pdev->dev,
"32-bit consistent DMA enable failed\n");