Merge "drivers: thermal: Ignore spurious BCL interrupts whenever BCL is in polling" (f8cd85f5) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/thermal/qcom/bcl_peripheral.c

+9 −21

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.
		* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -424,21 +424,15 @@ static irqreturn_t bcl_handle_ibat(int irq, void *data)
		{
		struct bcl_peripheral_data *perph_data =
		(struct bcl_peripheral_data *)data;
		bool irq_enabled = false;

		mutex_lock(&perph_data->state_trans_lock);
		if (!perph_data->irq_enabled) {
		WARN_ON(1);
		disable_irq_nosync(irq);
		perph_data->irq_enabled = false;
		goto exit_intr;
		}
		irq_enabled = perph_data->irq_enabled;
		mutex_unlock(&perph_data->state_trans_lock);
		of_thermal_handle_trip(perph_data->tz_dev);

		return IRQ_HANDLED;
		if (irq_enabled)
		of_thermal_handle_trip(perph_data->tz_dev);

		exit_intr:
		mutex_unlock(&perph_data->state_trans_lock);
		return IRQ_HANDLED;
		}

		@@ -446,21 +440,15 @@ static irqreturn_t bcl_handle_vbat(int irq, void *data)
		{
		struct bcl_peripheral_data *perph_data =
		(struct bcl_peripheral_data *)data;
		bool irq_enabled = false;

		mutex_lock(&perph_data->state_trans_lock);
		if (!perph_data->irq_enabled) {
		WARN_ON(1);
		disable_irq_nosync(irq);
		perph_data->irq_enabled = false;
		goto exit_intr;
		}
		irq_enabled = perph_data->irq_enabled;
		mutex_unlock(&perph_data->state_trans_lock);
		of_thermal_handle_trip(perph_data->tz_dev);

		return IRQ_HANDLED;
		if (irq_enabled)
		of_thermal_handle_trip(perph_data->tz_dev);

		exit_intr:
		mutex_unlock(&perph_data->state_trans_lock);
		return IRQ_HANDLED;
		}