@@ -142,7 +142,6 @@ enum soc_type {
142
142
* @base_second: base address of the common registers of the TMU controller.
143
143
* @irq: irq number of the TMU controller.
144
144
* @soc: id of the SOC type.
145
- * @irq_work: pointer to the irq work structure.
146
145
* @lock: lock to implement synchronization.
147
146
* @clk: pointer to the clock structure.
148
147
* @clk_sec: pointer to the clock structure for accessing the base_second.
@@ -175,7 +174,6 @@ struct exynos_tmu_data {
175
174
void __iomem * base_second ;
176
175
int irq ;
177
176
enum soc_type soc ;
178
- struct work_struct irq_work ;
179
177
struct mutex lock ;
180
178
struct clk * clk , * clk_sec , * sclk ;
181
179
u32 cal_type ;
@@ -763,10 +761,9 @@ static int exynos7_tmu_read(struct exynos_tmu_data *data)
763
761
EXYNOS7_TMU_TEMP_MASK ;
764
762
}
765
763
766
- static void exynos_tmu_work ( struct work_struct * work )
764
+ static irqreturn_t exynos_tmu_threaded_irq ( int irq , void * id )
767
765
{
768
- struct exynos_tmu_data * data = container_of (work ,
769
- struct exynos_tmu_data , irq_work );
766
+ struct exynos_tmu_data * data = id ;
770
767
771
768
thermal_zone_device_update (data -> tzd , THERMAL_EVENT_UNSPECIFIED );
772
769
@@ -778,7 +775,8 @@ static void exynos_tmu_work(struct work_struct *work)
778
775
779
776
clk_disable (data -> clk );
780
777
mutex_unlock (& data -> lock );
781
- enable_irq (data -> irq );
778
+
779
+ return IRQ_HANDLED ;
782
780
}
783
781
784
782
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
810
writel (val_irq , data -> base + tmu_intclear );
813
811
}
814
812
815
- static irqreturn_t exynos_tmu_irq (int irq , void * id )
816
- {
817
- struct exynos_tmu_data * data = id ;
818
-
819
- disable_irq_nosync (irq );
820
- schedule_work (& data -> irq_work );
821
-
822
- return IRQ_HANDLED ;
823
- }
824
-
825
813
static const struct of_device_id exynos_tmu_match [] = {
826
814
{
827
815
.compatible = "samsung,exynos3250-tmu" ,
@@ -1023,8 +1011,6 @@ static int exynos_tmu_probe(struct platform_device *pdev)
1023
1011
if (ret )
1024
1012
goto err_sensor ;
1025
1013
1026
- INIT_WORK (& data -> irq_work , exynos_tmu_work );
1027
-
1028
1014
data -> clk = devm_clk_get (& pdev -> dev , "tmu_apbif" );
1029
1015
if (IS_ERR (data -> clk )) {
1030
1016
dev_err (& pdev -> dev , "Failed to get clock\n" );
@@ -1093,8 +1079,11 @@ static int exynos_tmu_probe(struct platform_device *pdev)
1093
1079
goto err_sclk ;
1094
1080
}
1095
1081
1096
- ret = devm_request_irq (& pdev -> dev , data -> irq , exynos_tmu_irq ,
1097
- IRQF_TRIGGER_RISING | IRQF_SHARED , dev_name (& pdev -> dev ), data );
1082
+ ret = devm_request_threaded_irq (& pdev -> dev , data -> irq , NULL ,
1083
+ exynos_tmu_threaded_irq ,
1084
+ IRQF_TRIGGER_RISING
1085
+ | IRQF_SHARED | IRQF_ONESHOT ,
1086
+ dev_name (& pdev -> dev ), data );
1098
1087
if (ret ) {
1099
1088
dev_err (& pdev -> dev , "Failed to request irq: %d\n" , data -> irq );
1100
1089
goto err_sclk ;
0 commit comments