Commit 20009a81 authored by Mateusz Majewski's avatar Mateusz Majewski Committed by Daniel Lezcano

thermal/drivers/exynos: Wwitch from workqueue-driven interrupt handling to threaded interrupts

The workqueue boilerplate is mostly one-to-one what the threaded
interrupts do.
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarMateusz Majewski <m.majewski2@samsung.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20231201095625.301884-4-m.majewski2@samsung.com
parent 0ac3e1cf
...@@ -142,7 +142,6 @@ enum soc_type { ...@@ -142,7 +142,6 @@ enum soc_type {
* @base_second: base address of the common registers of the TMU controller. * @base_second: base address of the common registers of the TMU controller.
* @irq: irq number of the TMU controller. * @irq: irq number of the TMU controller.
* @soc: id of the SOC type. * @soc: id of the SOC type.
* @irq_work: pointer to the irq work structure.
* @lock: lock to implement synchronization. * @lock: lock to implement synchronization.
* @clk: pointer to the clock structure. * @clk: pointer to the clock structure.
* @clk_sec: pointer to the clock structure for accessing the base_second. * @clk_sec: pointer to the clock structure for accessing the base_second.
...@@ -175,7 +174,6 @@ struct exynos_tmu_data { ...@@ -175,7 +174,6 @@ struct exynos_tmu_data {
void __iomem *base_second; void __iomem *base_second;
int irq; int irq;
enum soc_type soc; enum soc_type soc;
struct work_struct irq_work;
struct mutex lock; struct mutex lock;
struct clk *clk, *clk_sec, *sclk; struct clk *clk, *clk_sec, *sclk;
u32 cal_type; u32 cal_type;
...@@ -763,10 +761,9 @@ static int exynos7_tmu_read(struct exynos_tmu_data *data) ...@@ -763,10 +761,9 @@ static int exynos7_tmu_read(struct exynos_tmu_data *data)
EXYNOS7_TMU_TEMP_MASK; EXYNOS7_TMU_TEMP_MASK;
} }
static void exynos_tmu_work(struct work_struct *work) static irqreturn_t exynos_tmu_threaded_irq(int irq, void *id)
{ {
struct exynos_tmu_data *data = container_of(work, struct exynos_tmu_data *data = id;
struct exynos_tmu_data, irq_work);
thermal_zone_device_update(data->tzd, THERMAL_EVENT_UNSPECIFIED); thermal_zone_device_update(data->tzd, THERMAL_EVENT_UNSPECIFIED);
...@@ -778,7 +775,8 @@ static void exynos_tmu_work(struct work_struct *work) ...@@ -778,7 +775,8 @@ static void exynos_tmu_work(struct work_struct *work)
clk_disable(data->clk); clk_disable(data->clk);
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
enable_irq(data->irq);
return IRQ_HANDLED;
} }
static void exynos4210_tmu_clear_irqs(struct exynos_tmu_data *data) static void exynos4210_tmu_clear_irqs(struct exynos_tmu_data *data)
...@@ -812,16 +810,6 @@ static void exynos4210_tmu_clear_irqs(struct exynos_tmu_data *data) ...@@ -812,16 +810,6 @@ static void exynos4210_tmu_clear_irqs(struct exynos_tmu_data *data)
writel(val_irq, data->base + tmu_intclear); writel(val_irq, data->base + tmu_intclear);
} }
static irqreturn_t exynos_tmu_irq(int irq, void *id)
{
struct exynos_tmu_data *data = id;
disable_irq_nosync(irq);
schedule_work(&data->irq_work);
return IRQ_HANDLED;
}
static const struct of_device_id exynos_tmu_match[] = { static const struct of_device_id exynos_tmu_match[] = {
{ {
.compatible = "samsung,exynos3250-tmu", .compatible = "samsung,exynos3250-tmu",
...@@ -1023,8 +1011,6 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -1023,8 +1011,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_sensor; goto err_sensor;
INIT_WORK(&data->irq_work, exynos_tmu_work);
data->clk = devm_clk_get(&pdev->dev, "tmu_apbif"); data->clk = devm_clk_get(&pdev->dev, "tmu_apbif");
if (IS_ERR(data->clk)) { if (IS_ERR(data->clk)) {
dev_err(&pdev->dev, "Failed to get clock\n"); dev_err(&pdev->dev, "Failed to get clock\n");
...@@ -1093,8 +1079,11 @@ static int exynos_tmu_probe(struct platform_device *pdev) ...@@ -1093,8 +1079,11 @@ static int exynos_tmu_probe(struct platform_device *pdev)
goto err_sclk; goto err_sclk;
} }
ret = devm_request_irq(&pdev->dev, data->irq, exynos_tmu_irq, ret = devm_request_threaded_irq(&pdev->dev, data->irq, NULL,
IRQF_TRIGGER_RISING | IRQF_SHARED, dev_name(&pdev->dev), data); exynos_tmu_threaded_irq,
IRQF_TRIGGER_RISING
| IRQF_SHARED | IRQF_ONESHOT,
dev_name(&pdev->dev), data);
if (ret) { if (ret) {
dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq); dev_err(&pdev->dev, "Failed to request irq: %d\n", data->irq);
goto err_sclk; goto err_sclk;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment