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 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
sound
/
pci
/
sis7019.c
diff --git
a/sound/pci/sis7019.c
b/sound/pci/sis7019.c
index efe669b802569904a211f7cef8235d95b505cf71..f3860b850210152f2333be252a887d9ac6c15319 100644
(file)
--- a/
sound/pci/sis7019.c
+++ b/
sound/pci/sis7019.c
@@
-383,9
+383,9
@@
static void __sis_map_silence(struct sis7019 *sis)
{
/* Helper function: must hold sis->voice_lock on entry */
if (!sis->silence_users)
{
/* Helper function: must hold sis->voice_lock on entry */
if (!sis->silence_users)
- sis->silence_dma_addr =
pci_map_single(sis->pci
,
+ sis->silence_dma_addr =
dma_map_single(&sis->pci->dev
,
sis->suspend_state[0],
sis->suspend_state[0],
- 4096,
PCI_DMA_TO
DEVICE);
+ 4096,
DMA_TO_
DEVICE);
sis->silence_users++;
}
sis->silence_users++;
}
@@
-394,8
+394,8
@@
static void __sis_unmap_silence(struct sis7019 *sis)
/* Helper function: must hold sis->voice_lock on entry */
sis->silence_users--;
if (!sis->silence_users)
/* Helper function: must hold sis->voice_lock on entry */
sis->silence_users--;
if (!sis->silence_users)
-
pci_unmap_single(sis->pci
, sis->silence_dma_addr, 4096,
-
PCI_DMA_TO
DEVICE);
+
dma_unmap_single(&sis->pci->dev
, sis->silence_dma_addr, 4096,
+
DMA_TO_
DEVICE);
}
static void sis_free_voice(struct sis7019 *sis, struct voice *voice)
}
static void sis_free_voice(struct sis7019 *sis, struct voice *voice)
@@
-1325,7
+1325,7
@@
static int sis_chip_create(struct snd_card *card,
if (rc)
goto error_out;
if (rc)
goto error_out;
- rc =
pci_set_dma_mask(pci
, DMA_BIT_MASK(30));
+ rc =
dma_set_mask(&pci->dev
, DMA_BIT_MASK(30));
if (rc < 0) {
dev_err(&pci->dev, "architecture does not support 30-bit PCI busmaster DMA");
goto error_out_enabled;
if (rc < 0) {
dev_err(&pci->dev, "architecture does not support 30-bit PCI busmaster DMA");
goto error_out_enabled;