Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d39cd55f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ASoC: msm: qdsp6v2: Change audio drivers to use %pK"

parents 475e375e 57260dab

drivers/misc/qcom/qdsp6v2/amrwb_in.c

+1 −1
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ static int amrwb_in_open(struct inode *inode, struct file *file) 
				(void *)audio);



	if (!audio->ac) {

		pr_err("%s:audio[%p]: Could not allocate memory for audio"

		pr_err("%s:audio[%pK]: Could not allocate memory for audio"

			"client\n", __func__, audio);

		kfree(audio->enc_cfg);

		kfree(audio);

drivers/misc/qcom/qdsp6v2/audio_aac.c

+5 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2010-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2016, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -221,10 +221,10 @@ static long audio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		break;

	}

	default: {

		pr_debug("%s[%p]: Calling utils ioctl\n", __func__, audio);

		pr_debug("%s[%pK]: Calling utils ioctl\n", __func__, audio);

		rc = audio->codec_ioctl(file, cmd, arg);

		if (rc)

			pr_err("%s[%p]:Failed in utils_ioctl: %d\n",

			pr_err("%s[%pK]:Failed in utils_ioctl: %d\n",

				__func__, audio, rc);

	}

	}
@@ -328,10 +328,10 @@ static long audio_compat_ioctl(struct file *file, unsigned int cmd, 
		break;

	}

	default: {

		pr_debug("%s[%p]: Calling utils ioctl\n", __func__, audio);

		pr_debug("%s[%pK]: Calling utils ioctl\n", __func__, audio);

		rc = audio->codec_compat_ioctl(file, cmd, arg);

		if (rc)

			pr_err("%s[%p]:Failed in utils_ioctl: %d\n",

			pr_err("%s[%pK]:Failed in utils_ioctl: %d\n",

				__func__, audio, rc);

	}

	}

drivers/misc/qcom/qdsp6v2/audio_alac.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ static long audio_ioctl_shared(struct file *file, unsigned int cmd, 
					__func__, audio->pcm_cfg.channel_count);

		}



		pr_debug("%s[%p]: AUDIO_START session_id[%d]\n", __func__,

		pr_debug("%s[%pK]: AUDIO_START session_id[%d]\n", __func__,

						audio, audio->ac->session);

		if (audio->feedback == NON_TUNNEL_MODE) {

			/* Configure PCM output block */

drivers/misc/qcom/qdsp6v2/audio_amrnb.c

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -33,7 +33,7 @@ static long audio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


	switch (cmd) {

	case AUDIO_START: {

		pr_debug("%s[%p]: AUDIO_START session_id[%d]\n", __func__,

		pr_debug("%s[%pK]: AUDIO_START session_id[%d]\n", __func__,

						audio, audio->ac->session);

		if (audio->feedback == NON_TUNNEL_MODE) {

			/* Configure PCM output block */
@@ -62,7 +62,7 @@ static long audio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		break;

	}

	default:

		pr_debug("%s[%p]: Calling utils ioctl\n", __func__, audio);

		pr_debug("%s[%pK]: Calling utils ioctl\n", __func__, audio);

		rc = audio->codec_ioctl(file, cmd, arg);

	}

	return rc;

drivers/misc/qcom/qdsp6v2/audio_amrwb.c

+3 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -34,7 +34,7 @@ static long audio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 


	switch (cmd) {

	case AUDIO_START: {

		pr_debug("%s[%p]: AUDIO_START session_id[%d]\n", __func__,

		pr_debug("%s[%pK]: AUDIO_START session_id[%d]\n", __func__,

						audio, audio->ac->session);

		if (audio->feedback == NON_TUNNEL_MODE) {

			/* Configure PCM output block */
@@ -65,7 +65,7 @@ static long audio_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		break;

	}

	default:

		pr_debug("%s[%p]: Calling utils ioctl\n", __func__, audio);

		pr_debug("%s[%pK]: Calling utils ioctl\n", __func__, audio);

		rc = audio->codec_ioctl(file, cmd, arg);

	}

	return rc;