mk-rootfs.sh

hc

2023-12-11 072de836f53be56a70cecf70b43ae43b7ce17376

 kernel/drivers/mfd/fsl-imx25-tsadc.c
..
..
@@ -1,9 +1,6 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * Copyright (C) 2014-2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
3
- *
4
- * This program is free software; you can redistribute it and/or modify it under
5
- * the terms of the GNU General Public License version 2 as published by the
6
- * Free Software Foundation.
7
4
  */
8
5
 
9
6
 #include <linux/clk.h>
..
..
@@ -72,10 +69,8 @@
72
69
 	int irq;
73
70
 
74
71
 	irq = platform_get_irq(pdev, 0);
75
-	if (irq <= 0) {
76
-		dev_err(dev, "Failed to get irq\n");
72
+	if (irq < 0)
77
73
 		return irq;
78
-	}
79
74
 
80
75
 	tsadc->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops,
81
76
 					      tsadc);
..
..
@@ -85,6 +80,19 @@
85
80
 	}
86
81
 
87
82
 	irq_set_chained_handler_and_data(irq, mx25_tsadc_irq_handler, tsadc);
83
+
84
+	return 0;
85
+}
86
+
87
+static int mx25_tsadc_unset_irq(struct platform_device *pdev)
88
+{
89
+	struct mx25_tsadc *tsadc = platform_get_drvdata(pdev);
90
+	int irq = platform_get_irq(pdev, 0);
91
+
92
+	if (irq >= 0) {
93
+		irq_set_chained_handler_and_data(irq, NULL, NULL);
94
+		irq_domain_remove(tsadc->domain);
95
+	}
88
96
 
89
97
 	return 0;
90
98
 }
..
..
@@ -176,18 +184,21 @@
176
184
 
177
185
 	platform_set_drvdata(pdev, tsadc);
178
186
 
179
-	return devm_of_platform_populate(dev);
187
+	ret = devm_of_platform_populate(dev);
188
+	if (ret)
189
+		goto err_irq;
190
+
191
+	return 0;
192
+
193
+err_irq:
194
+	mx25_tsadc_unset_irq(pdev);
195
+
196
+	return ret;
180
197
 }
181
198
 
182
199
 static int mx25_tsadc_remove(struct platform_device *pdev)
183
200
 {
184
-	struct mx25_tsadc *tsadc = platform_get_drvdata(pdev);
185
-	int irq = platform_get_irq(pdev, 0);
186
-
187
-	if (irq) {
188
-		irq_set_chained_handler_and_data(irq, NULL, NULL);
189
-		irq_domain_remove(tsadc->domain);
190
-	}
201
+	mx25_tsadc_unset_irq(pdev);
191
202
 
192
203
 	return 0;
193
204
 }