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

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

Merge "soc: qcom: bam_dmux: Replace wake locks with wakeup sources"

parents 6357691f e6d6852a

drivers/soc/qcom/bam_dmux.c

+5 −5
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/skbuff.h>

#include <linux/debugfs.h>

#include <linux/clk.h>

#include <linux/wakelock.h>

#include <linux/pm.h>

#include <linux/of.h>

#include <linux/ipc_logging.h>

#include <linux/srcu.h>
@@ -255,7 +255,7 @@ static DEFINE_RWLOCK(ul_wakeup_lock); 
static DECLARE_WORK(kickoff_ul_wakeup, kickoff_ul_wakeup_func);

static int bam_connection_is_active;

static int wait_for_ack;

static struct wake_lock bam_wakelock;

static struct wakeup_source bam_wakelock;

static int a2_pc_disabled;

static DEFINE_MUTEX(dfab_status_lock);

static int dfab_is_on;
@@ -2140,7 +2140,7 @@ static void grab_wakelock(void) 
	BAM_DMUX_LOG("%s: ref count = %d\n", __func__,

						wakelock_reference_count);

	if (wakelock_reference_count == 0)

		wake_lock(&bam_wakelock);

		__pm_stay_awake(&bam_wakelock);

	++wakelock_reference_count;

	spin_unlock_irqrestore(&wakelock_reference_lock, flags);

}
@@ -2160,7 +2160,7 @@ static void release_wakelock(void) 
						wakelock_reference_count);

	--wakelock_reference_count;

	if (wakelock_reference_count == 0)

		wake_unlock(&bam_wakelock);

		__pm_relax(&bam_wakelock);

	spin_unlock_irqrestore(&wakelock_reference_lock, flags);

}
@@ -2746,7 +2746,7 @@ static int bam_dmux_probe(struct platform_device *pdev) 
	init_completion(&shutdown_completion);

	complete_all(&shutdown_completion);

	INIT_DELAYED_WORK(&ul_timeout_work, ul_timeout);

	wake_lock_init(&bam_wakelock, WAKE_LOCK_SUSPEND, "bam_dmux_wakelock");

	wakeup_source_init(&bam_wakelock, "bam_dmux_wakelock");

	init_srcu_struct(&bam_dmux_srcu);



	subsys_h = subsys_notif_register_notifier("modem", &restart_notifier);