Commit 939b90be authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Fabio Baltieri
Browse files

drivers: drop few redundant guard around pm_policy_state_lock_* 

The pm_policy_state_lock_put and pm_policy_state_lock_put functions
already become a no-op if CONFIG_PM is not enabled. Drop the guards
around it in few different drivers.

Signed-off-by: default avatarFabio Baltieri <fabiobaltieri@google.com>
parent 2a6cec06

drivers/display/display_rm67162.c

+2 −6
Changes for drivers/display/display_rm67162.c: 2 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -434,19 +434,15 @@ static int rm67162_write(const struct device *dev, const uint16_t x, 
	 * give to the TE semaphore) before sending the frame

	 */

	if (config->te_gpio.port != NULL) {

		if (IS_ENABLED(CONFIG_PM)) {

			/* Block sleep state until next TE interrupt

			 * so we can send frame during that interval

		/* Block sleep state until next TE interrupt so we can send

		 * frame during that interval

		 */

		pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE,

					 PM_ALL_SUBSTATES);

		}

		k_sem_take(&data->te_sem, K_FOREVER);

		if (IS_ENABLED(CONFIG_PM)) {

		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE,

					 PM_ALL_SUBSTATES);

	}

	}

	src = buf;

	first_cmd = true;

drivers/dma/dma_mcux_smartdma.c

+6 −6
Changes for drivers/dma/dma_mcux_smartdma.c: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -148,12 +148,12 @@ static int dma_mcux_smartdma_start(const struct device *dev, uint32_t channel) 
{

	const struct dma_mcux_smartdma_config *config = dev->config;



#ifdef CONFIG_PM

	/* Block PM transition until DMA completes */

	pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif



	/* Kick off SMARTDMA */

	config->base->CTRL = SMARTDMA_MAGIC | SMARTDMA_BOOT;



	return 0;

}
@@ -162,12 +162,13 @@ static int dma_mcux_smartdma_stop(const struct device *dev, uint32_t channel) 
{

	ARG_UNUSED(dev);

	ARG_UNUSED(channel);



	/* Stop DMA  */

	SMARTDMA_Reset();

#ifdef CONFIG_PM



	/* Release PM lock */

	pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif



	return 0;

}
@@ -195,10 +196,9 @@ static void dma_mcux_smartdma_irq(const struct device *dev) 
	if (data->callback) {

		data->callback(dev, data->user_data, 0, 0);

	}

#ifdef CONFIG_PM



	/* Release PM lock */

	pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif

}



/**

drivers/eeprom/eeprom_mchp_xec.c

+3 −8
Changes for drivers/eeprom/eeprom_mchp_xec.c: 3 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -241,9 +241,8 @@ static int eeprom_xec_read(const struct device *dev, off_t offset, 
	}



	k_mutex_lock(&data->lock_mtx, K_FOREVER);

#ifdef CONFIG_PM_DEVICE

	pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif



	/* EEPROM HW READ */

	for (chunk_idx = 0; chunk_idx < len; chunk_idx += XEC_EEPROM_TRANSFER_SIZE_READ) {

		if ((len-chunk_idx) < XEC_EEPROM_TRANSFER_SIZE_READ) {
@@ -252,9 +251,7 @@ static int eeprom_xec_read(const struct device *dev, off_t offset, 
		eeprom_xec_data_read_32_bytes(regs, &data_buf[chunk_idx],

						chunk_size, (offset+chunk_idx));

	}

#ifdef CONFIG_PM_DEVICE

	pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif

	k_mutex_unlock(&data->lock_mtx);



	return 0;
@@ -280,9 +277,8 @@ static int eeprom_xec_write(const struct device *dev, off_t offset, 
	}



	k_mutex_lock(&data->lock_mtx, K_FOREVER);

#ifdef CONFIG_PM_DEVICE

	pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif



	/* EEPROM HW WRITE */

	for (chunk_idx = 0; chunk_idx < len; chunk_idx += XEC_EEPROM_TRANSFER_SIZE_WRITE) {

		if ((len-chunk_idx) < XEC_EEPROM_TRANSFER_SIZE_WRITE) {
@@ -291,9 +287,8 @@ static int eeprom_xec_write(const struct device *dev, off_t offset, 
		eeprom_xec_data_write_32_bytes(regs, &data_buf[chunk_idx],

							chunk_size, (offset+chunk_idx));

	}

#ifdef CONFIG_PM_DEVICE



	pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif

	k_mutex_unlock(&data->lock_mtx);



	return 0;

drivers/kscan/kscan_mchp_xec.c

+2 −4
Changes for drivers/kscan/kscan_mchp_xec.c: 2 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -373,9 +373,8 @@ void polling_task(const struct device *dev, void *dummy2, void *dummy3) 
		drive_keyboard_column(dev, KEYBOARD_COLUMN_DRIVE_ALL);



		k_sem_take(&data->poll_lock, K_FOREVER);

#ifdef CONFIG_PM_DEVICE

		pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif



		uint32_t start_poll_cycles = k_cycle_get_32();



		while (atomic_get(&data->enable_scan) == 1U) {
@@ -416,9 +415,8 @@ void polling_task(const struct device *dev, void *dummy2, void *dummy3) 
			/* Allow other threads to run while we sleep */

			k_usleep(wait_period);

		}

#ifdef CONFIG_PM_DEVICE



		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif

	}

}

drivers/ps2/ps2_mchp_xec.c

+6 −10
Changes for drivers/ps2/ps2_mchp_xec.c: 6 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -172,9 +172,9 @@ static int ps2_xec_write(const struct device *dev, uint8_t value) 
		LOG_DBG("PS2 write timed out");

		return -ETIMEDOUT;

	}

#ifdef CONFIG_PM_DEVICE



	pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif



	/* Inhibit ps2 controller and clear status register */

	regs->CTRL = 0x00;
@@ -306,33 +306,29 @@ static void ps2_xec_isr(const struct device *dev) 
	ps2_xec_girq_clr(config->girq_id, config->girq_bit);



	if (status & MCHP_PS2_STATUS_RXD_RDY) {

#ifdef CONFIG_PM_DEVICE

		pm_policy_state_lock_get(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif



		regs->CTRL = 0x00;

		if (data->callback_isr) {

			data->callback_isr(dev, regs->TRX_BUFF);

		}

#ifdef CONFIG_PM_DEVICE



		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif

	} else if (status &

		    (MCHP_PS2_STATUS_TX_TMOUT | MCHP_PS2_STATUS_TX_ST_TMOUT)) {

		/* Clear sticky bits and go to read mode */

		regs->STATUS = MCHP_PS2_STATUS_RW1C_MASK;

		LOG_ERR("TX time out: %0x", status);

#ifdef CONFIG_PM_DEVICE



		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif

	} else if (status &

			(MCHP_PS2_STATUS_RX_TMOUT | MCHP_PS2_STATUS_PE | MCHP_PS2_STATUS_FE)) {

		/* catch and clear rx error if any */

		regs->STATUS = MCHP_PS2_STATUS_RW1C_MASK;

	} else if (status & MCHP_PS2_STATUS_TX_IDLE) {

		/* Transfer completed, release the lock to enter low per mode */

#ifdef CONFIG_PM_DEVICE



		pm_policy_state_lock_put(PM_STATE_SUSPEND_TO_IDLE, PM_ALL_SUBSTATES);

#endif

	}



	/* The control register reverts to RX automatically after

CRA Git | Maintained and supported by SUSTech CRA and CCSE