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

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

Merge "diag: Remove spinlock protection while releasing wake source"

parents e74ba3fb 46c4dbc8

drivers/char/diag/diagchar.h

+0 −1
Original line number Diff line number Diff line
@@ -541,7 +541,6 @@ struct diagchar_dev { 
	/* Power related variables */

	struct diag_ws_ref_t dci_ws;

	struct diag_ws_ref_t md_ws;

	spinlock_t ws_lock;

	/* Pointers to Diag Masks */

	struct diag_mask_info *msg_mask;

	struct diag_mask_info *log_mask;

drivers/char/diag/diagchar_core.c

+0 −6
Original line number Diff line number Diff line
@@ -2537,8 +2537,6 @@ void diag_ws_init() 
	driver->md_ws.ref_count = 0;

	driver->md_ws.copy_count = 0;

	spin_lock_init(&driver->md_ws.lock);



	spin_lock_init(&driver->ws_lock);

}



static void diag_stats_init(void)
@@ -2701,12 +2699,8 @@ void diag_ws_reset(int type) 


void diag_ws_release()

{

	unsigned long flags;



	spin_lock_irqsave(&driver->ws_lock, flags);

	if (driver->dci_ws.ref_count == 0 && driver->md_ws.ref_count == 0)

		pm_relax(driver->diag_dev);

	spin_unlock_irqrestore(&driver->ws_lock, flags);

}



#ifdef DIAG_DEBUG