From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 31 Jan 2017 07:02:16 +0000 (+0100)
Subject: ALSA: x86: Move dma_mask debug print into intel_hdmi_lpe_audio.c
X-Git-Tag: v4.11-rc1~100^2~10^2~34^2~35
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dae15a9d960e513d5b60c00c306cddd87465f1c4;p=linux.git

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>
---

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);