* [PATCH V2] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
@ 2020-11-21 8:37 ` Christophe JAILLET
0 siblings, 0 replies; 6+ messages in thread
From: Christophe JAILLET @ 2020-11-21 8:37 UTC (permalink / raw)
To: perex, tiwai, dan.carpenter
Cc: Christophe JAILLET, alsa-devel, kernel-janitors, linux-kernel
'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v2: do not update the dev_err message, to keep consistency with other dev_err
---
sound/pci/emu10k1/emu10k1x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index def8161cde4c..f2b6fd434474 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -894,8 +894,8 @@ static int snd_emu10k1x_create(struct snd_card *card,
if ((err = pci_enable_device(pci)) < 0)
return err;
- if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
- pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+
+ if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) {
dev_err(card->dev, "error to set 28bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
@ 2020-11-21 8:37 ` Christophe JAILLET
0 siblings, 0 replies; 6+ messages in thread
From: Christophe JAILLET @ 2020-11-21 8:37 UTC (permalink / raw)
To: perex, tiwai, dan.carpenter
Cc: alsa-devel, linux-kernel, kernel-janitors, Christophe JAILLET
'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v2: do not update the dev_err message, to keep consistency with other dev_err
---
sound/pci/emu10k1/emu10k1x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index def8161cde4c..f2b6fd434474 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -894,8 +894,8 @@ static int snd_emu10k1x_create(struct snd_card *card,
if ((err = pci_enable_device(pci)) < 0)
return err;
- if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
- pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+
+ if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) {
dev_err(card->dev, "error to set 28bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH V2] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
@ 2020-11-21 8:37 ` Christophe JAILLET
0 siblings, 0 replies; 6+ messages in thread
From: Christophe JAILLET @ 2020-11-21 8:37 UTC (permalink / raw)
To: perex, tiwai, dan.carpenter
Cc: Christophe JAILLET, alsa-devel, kernel-janitors, linux-kernel
'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
v2: do not update the dev_err message, to keep consistency with other dev_err
---
sound/pci/emu10k1/emu10k1x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/pci/emu10k1/emu10k1x.c b/sound/pci/emu10k1/emu10k1x.c
index def8161cde4c..f2b6fd434474 100644
--- a/sound/pci/emu10k1/emu10k1x.c
+++ b/sound/pci/emu10k1/emu10k1x.c
@@ -894,8 +894,8 @@ static int snd_emu10k1x_create(struct snd_card *card,
if ((err = pci_enable_device(pci)) < 0)
return err;
- if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 ||
- pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) {
+
+ if (dma_set_mask_and_coherent(&pci->dev, DMA_BIT_MASK(28)) < 0) {
dev_err(card->dev, "error to set 28bit mask DMA\n");
pci_disable_device(pci);
return -ENXIO;
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH V2] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
2020-11-21 8:37 ` Christophe JAILLET
(?)
@ 2020-11-21 9:33 ` Takashi Iwai
-1 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2020-11-21 9:33 UTC (permalink / raw)
To: Christophe JAILLET
Cc: alsa-devel, kernel-janitors, linux-kernel, tiwai, dan.carpenter
On Sat, 21 Nov 2020 09:37:47 +0100,
Christophe JAILLET wrote:
>
> 'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
> an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> v2: do not update the dev_err message, to keep consistency with other dev_err
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
@ 2020-11-21 9:33 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2020-11-21 9:33 UTC (permalink / raw)
To: Christophe JAILLET
Cc: perex, tiwai, dan.carpenter, alsa-devel, linux-kernel,
kernel-janitors
On Sat, 21 Nov 2020 09:37:47 +0100,
Christophe JAILLET wrote:
>
> 'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
> an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> v2: do not update the dev_err message, to keep consistency with other dev_err
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH V2] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code
@ 2020-11-21 9:33 ` Takashi Iwai
0 siblings, 0 replies; 6+ messages in thread
From: Takashi Iwai @ 2020-11-21 9:33 UTC (permalink / raw)
To: Christophe JAILLET
Cc: alsa-devel, kernel-janitors, linux-kernel, tiwai, dan.carpenter
On Sat, 21 Nov 2020 09:37:47 +0100,
Christophe JAILLET wrote:
>
> 'pci_set_dma_mask()' + 'pci_set_consistent_dma_mask()' can be replaced by
> an equivalent 'dma_set_mask_and_coherent()' which is much less verbose.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> v2: do not update the dev_err message, to keep consistency with other dev_err
Applied, thanks.
Takashi
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-11-21 9:38 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-21 8:37 [PATCH V2] ALSA: emu10k1: Use dma_set_mask_and_coherent to simplify code Christophe JAILLET
2020-11-21 8:37 ` Christophe JAILLET
2020-11-21 8:37 ` Christophe JAILLET
2020-11-21 9:33 ` Takashi Iwai
2020-11-21 9:33 ` Takashi Iwai
2020-11-21 9:33 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.