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

Commit a14b7641 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: extend wakelock hook to all misc drivers"

parents 5ac5bb8f 19a9abdc

drivers/misc/qcom/qdsp6v2/audio_aac.c

+16 −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) 2010-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2015, 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
@@ -22,6 +22,9 @@ 
#define AUDIO_AAC_DUAL_MONO_INVALID -1

#define PCM_BUFSZ_MIN_AAC	((8*1024) + sizeof(struct dec_meta_out))



static struct miscdevice audio_aac_misc;

static struct ws_mgr audio_aac_ws_mgr;



#ifdef CONFIG_DEBUG_FS

static const struct file_operations audio_aac_debug_fops = {

	.read = audio_aio_debug_read,
@@ -368,6 +371,9 @@ static int audio_open(struct inode *inode, struct file *file) 
	 * but at least we need to have initial config

	 */

	audio->pcm_cfg.buffer_size = PCM_BUFSZ_MIN_AAC;

	audio->miscdevice = &audio_aac_misc;

	audio->wakelock_voted = false;

	audio->audio_ws_mgr = &audio_aac_ws_mgr;

	aac_config->dual_mono_mode = AUDIO_AAC_DUAL_MONO_INVALID;



	audio->ac = q6asm_audio_client_alloc((app_cb) q6_audio_cb,
@@ -443,7 +449,7 @@ static const struct file_operations audio_aac_fops = { 
	.compat_ioctl = audio_compat_ioctl

};



struct miscdevice audio_aac_misc = {

static struct miscdevice audio_aac_misc = {

	.minor = MISC_DYNAMIC_MINOR,

	.name = "msm_aac",

	.fops = &audio_aac_fops,
@@ -451,7 +457,14 @@ struct miscdevice audio_aac_misc = { 


static int __init audio_aac_init(void)

{

	return misc_register(&audio_aac_misc);

	int ret = misc_register(&audio_aac_misc);



	if (ret == 0)

		device_init_wakeup(audio_aac_misc.this_device, true);

	audio_aac_ws_mgr.ref_cnt = 0;

	mutex_init(&audio_aac_ws_mgr.ws_lock);



	return ret;

}



device_initcall(audio_aac_init);

drivers/misc/qcom/qdsp6v2/audio_alac.c

+15 −2
Original line number Diff line number Diff line
@@ -16,6 +16,9 @@ 
#include <linux/compat.h>

#include "audio_utils_aio.h"



static struct miscdevice audio_alac_misc;

static struct ws_mgr audio_alac_ws_mgr;



static const struct file_operations audio_alac_debug_fops = {

	.read = audio_aio_debug_read,

	.open = audio_aio_debug_open,
@@ -281,6 +284,9 @@ static int audio_open(struct inode *inode, struct file *file) 
	}



	audio->pcm_cfg.buffer_size = PCM_BUFSZ_MIN;

	audio->miscdevice = &audio_alac_misc;

	audio->wakelock_voted = false;

	audio->audio_ws_mgr = &audio_alac_ws_mgr;



	audio->ac = q6asm_audio_client_alloc((app_cb) q6_audio_cb,

					     (void *)audio);
@@ -409,7 +415,7 @@ static const struct file_operations audio_alac_fops = { 
	.compat_ioctl = audio_compat_ioctl

};



struct miscdevice audio_alac_misc = {

static struct miscdevice audio_alac_misc = {

	.minor = MISC_DYNAMIC_MINOR,

	.name = "msm_alac",

	.fops = &audio_alac_fops,
@@ -417,7 +423,14 @@ struct miscdevice audio_alac_misc = { 


static int __init audio_alac_init(void)

{

	return misc_register(&audio_alac_misc);

	int ret = misc_register(&audio_alac_misc);



	if (ret == 0)

		device_init_wakeup(audio_alac_misc.this_device, true);

	audio_alac_ws_mgr.ref_cnt = 0;

	mutex_init(&audio_alac_ws_mgr.ws_lock);



	return ret;

}



device_initcall(audio_alac_init);

drivers/misc/qcom/qdsp6v2/audio_amrnb.c

+16 −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-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2015, 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
@@ -16,6 +16,9 @@ 
 */

#include "audio_utils_aio.h"



static struct miscdevice audio_amrnb_misc;

static struct ws_mgr audio_amrnb_ws_mgr;



#ifdef CONFIG_DEBUG_FS

static const struct file_operations audio_amrnb_debug_fops = {

	.read = audio_aio_debug_read,
@@ -82,6 +85,9 @@ static int audio_open(struct inode *inode, struct file *file) 
	}



	audio->pcm_cfg.buffer_size = PCM_BUFSZ_MIN;

	audio->miscdevice = &audio_amrnb_misc;

	audio->wakelock_voted = false;

	audio->audio_ws_mgr = &audio_amrnb_ws_mgr;



	audio->ac = q6asm_audio_client_alloc((app_cb) q6_audio_cb,

					     (void *)audio);
@@ -151,7 +157,7 @@ static const struct file_operations audio_amrnb_fops = { 
	.fsync = audio_aio_fsync,

};



struct miscdevice audio_amrnb_misc = {

static struct miscdevice audio_amrnb_misc = {

	.minor = MISC_DYNAMIC_MINOR,

	.name = "msm_amrnb",

	.fops = &audio_amrnb_fops,
@@ -159,7 +165,14 @@ struct miscdevice audio_amrnb_misc = { 


static int __init audio_amrnb_init(void)

{

	return misc_register(&audio_amrnb_misc);

	int ret = misc_register(&audio_amrnb_misc);



	if (ret == 0)

		device_init_wakeup(audio_amrnb_misc.this_device, true);

	audio_amrnb_ws_mgr.ref_cnt = 0;

	mutex_init(&audio_amrnb_ws_mgr.ws_lock);



	return ret;

}



device_initcall(audio_amrnb_init);

drivers/misc/qcom/qdsp6v2/audio_amrwb.c

+16 −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-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2015, 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
@@ -17,6 +17,9 @@ 


#include "audio_utils_aio.h"



static struct miscdevice audio_amrwb_misc;

static struct ws_mgr audio_amrwb_ws_mgr;



#ifdef CONFIG_DEBUG_FS

static const struct file_operations audio_amrwb_debug_fops = {

	.read = audio_aio_debug_read,
@@ -84,6 +87,9 @@ static int audio_open(struct inode *inode, struct file *file) 
		return -ENOMEM;

	}

	audio->pcm_cfg.buffer_size = PCM_BUFSZ_MIN;

	audio->miscdevice = &audio_amrwb_misc;

	audio->wakelock_voted = false;

	audio->audio_ws_mgr = &audio_amrwb_ws_mgr;



	audio->ac = q6asm_audio_client_alloc((app_cb) q6_audio_cb,

					     (void *)audio);
@@ -155,7 +161,7 @@ static const struct file_operations audio_amrwb_fops = { 
	.fsync = audio_aio_fsync,

};



struct miscdevice audio_amrwb_misc = {

static struct miscdevice audio_amrwb_misc = {

	.minor = MISC_DYNAMIC_MINOR,

	.name = "msm_amrwb",

	.fops = &audio_amrwb_fops,
@@ -163,7 +169,14 @@ struct miscdevice audio_amrwb_misc = { 


static int __init audio_amrwb_init(void)

{

	return misc_register(&audio_amrwb_misc);

	int ret = misc_register(&audio_amrwb_misc);



	if (ret == 0)

		device_init_wakeup(audio_amrwb_misc.this_device, true);

	audio_amrwb_ws_mgr.ref_cnt = 0;

	mutex_init(&audio_amrwb_ws_mgr.ws_lock);



	return ret;

}



device_initcall(audio_amrwb_init);

drivers/misc/qcom/qdsp6v2/audio_amrwbplus.c

+16 −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) 2010-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2010-2015, 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
@@ -18,6 +18,9 @@ 
#include <linux/compat.h>

#include "audio_utils_aio.h"



static struct miscdevice audio_amrwbplus_misc;

static struct ws_mgr audio_amrwbplus_ws_mgr;



#ifdef CONFIG_DEBUG_FS

static const struct file_operations audio_amrwbplus_debug_fops = {

	.read = audio_aio_debug_read,
@@ -302,6 +305,9 @@ static int audio_open(struct inode *inode, struct file *file) 
		return -ENOMEM;

	}

	audio->pcm_cfg.buffer_size = PCM_BUFSZ_MIN;

	audio->miscdevice = &audio_amrwbplus_misc;

	audio->wakelock_voted = false;

	audio->audio_ws_mgr = &audio_amrwbplus_ws_mgr;



	audio->ac =

	q6asm_audio_client_alloc((app_cb) q6_audio_cb, (void *)audio);
@@ -368,7 +374,7 @@ static const struct file_operations audio_amrwbplus_fops = { 
	.compat_ioctl = audio_compat_ioctl

};



struct miscdevice audio_amrwbplus_misc = {

static struct miscdevice audio_amrwbplus_misc = {

	.minor = MISC_DYNAMIC_MINOR,

	.name = "msm_amrwbplus",

	.fops = &audio_amrwbplus_fops,
@@ -376,7 +382,14 @@ struct miscdevice audio_amrwbplus_misc = { 


static int __init audio_amrwbplus_init(void)

{

	return misc_register(&audio_amrwbplus_misc);

	int ret = misc_register(&audio_amrwbplus_misc);



	if (ret == 0)

		device_init_wakeup(audio_amrwbplus_misc.this_device, true);

	audio_amrwbplus_ws_mgr.ref_cnt = 0;

	mutex_init(&audio_amrwbplus_ws_mgr.ws_lock);



	return ret;

}



device_initcall(audio_amrwbplus_init);