summaryrefslogtreecommitdiff
path: root/sound/x86
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2017-01-31 10:02:16 +0300
committerTakashi Iwai <tiwai@suse.de>2017-02-03 19:29:36 +0300
commitdae15a9d960e513d5b60c00c306cddd87465f1c4 (patch)
tree968e6c0739e7411b8eb57e346af41fd0f651975b /sound/x86
parent0e18060f99a42c20f87d64eb30e5f424509643ae (diff)
downloadlinux-dae15a9d960e513d5b60c00c306cddd87465f1c4.tar.xz
ALSA: x86: Move dma_mask debug print into intel_hdmi_lpe_audio.c
It belongs to the right place. And, remove a few sanity checks (e.g. NULL card) and debug prints as well. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/x86')
-rw-r--r--sound/x86/intel_hdmi_audio.c11
-rw-r--r--sound/x86/intel_hdmi_lpe_audio.c1
2 files changed, 1 insertions, 11 deletions
diff --git a/sound/x86/intel_hdmi_audio.c b/sound/x86/intel_hdmi_audio.c
index efc56544af17..49cb95072a88 100644
--- a/sound/x86/intel_hdmi_audio.c
+++ b/sound/x86/intel_hdmi_audio.c
@@ -1600,8 +1600,6 @@ int hdmi_audio_probe(struct platform_device *devptr,
pr_debug("Enter %s\n", __func__);
- pr_debug("hdmi_audio_probe dma_mask: %p\n", devptr->dev.dma_mask);
-
/* allocate memory for saving internal context and working */
intelhaddata = kzalloc(sizeof(*intelhaddata), GFP_KERNEL);
if (!intelhaddata)
@@ -1653,15 +1651,6 @@ int hdmi_audio_probe(struct platform_device *devptr,
retval = snd_pcm_lib_preallocate_pages_for_all(pcm,
SNDRV_DMA_TYPE_DEV, NULL,
HAD_MAX_BUFFER, HAD_MAX_BUFFER);
-
- if (card->dev == NULL)
- pr_debug("card->dev is NULL!!!!! Should not be this case\n");
- else if (card->dev->dma_mask == NULL)
- pr_debug("hdmi_audio_probe dma_mask is NULL!!!!!\n");
- else
- pr_debug("hdmi_audio_probe dma_mask is : %p\n",
- card->dev->dma_mask);
-
if (retval)
goto err;
diff --git a/sound/x86/intel_hdmi_lpe_audio.c b/sound/x86/intel_hdmi_lpe_audio.c
index 53864d372861..6f823d4278bb 100644
--- a/sound/x86/intel_hdmi_lpe_audio.c
+++ b/sound/x86/intel_hdmi_lpe_audio.c
@@ -315,6 +315,7 @@ static int hdmi_lpe_audio_probe(struct platform_device *pdev)
};
dev_dbg(&pdev->dev, "Enter %s\n", __func__);
+ dev_dbg(&pdev->dev, "dma_mask: %p\n", pdev->dev.dma_mask);
/* get resources */
irq = platform_get_irq(pdev, 0);