change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/hwspinlock/u8500_hsem.c
..
..
@@ -16,7 +16,6 @@
16
16
 #include <linux/module.h>
17
17
 #include <linux/delay.h>
18
18
 #include <linux/io.h>
19
-#include <linux/pm_runtime.h>
20
19
 #include <linux/slab.h>
21
20
 #include <linux/spinlock.h>
22
21
 #include <linux/hwspinlock.h>
..
..
@@ -88,21 +87,16 @@
88
87
 	struct hwspinlock_pdata *pdata = pdev->dev.platform_data;
89
88
 	struct hwspinlock_device *bank;
90
89
 	struct hwspinlock *hwlock;
91
-	struct resource *res;
92
90
 	void __iomem *io_base;
93
-	int i, ret, num_locks = U8500_MAX_SEMAPHORE;
91
+	int i, num_locks = U8500_MAX_SEMAPHORE;
94
92
 	ulong val;
95
93
 
96
94
 	if (!pdata)
97
95
 		return -ENODEV;
98
96
 
99
-	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
100
-	if (!res)
101
-		return -ENODEV;
102
-
103
-	io_base = ioremap(res->start, resource_size(res));
104
-	if (!io_base)
105
-		return -ENOMEM;
97
+	io_base = devm_platform_ioremap_resource(pdev, 0);
98
+	if (IS_ERR(io_base))
99
+		return PTR_ERR(io_base);
106
100
 
107
101
 	/* make sure protocol 1 is selected */
108
102
 	val = readl(io_base + HSEM_CTRL_REG);
..
..
@@ -111,53 +105,28 @@
111
105
 	/* clear all interrupts */
112
106
 	writel(0xFFFF, io_base + HSEM_ICRALL);
113
107
 
114
-	bank = kzalloc(struct_size(bank, lock, num_locks), GFP_KERNEL);
115
-	if (!bank) {
116
-		ret = -ENOMEM;
117
-		goto iounmap_base;
118
-	}
108
+	bank = devm_kzalloc(&pdev->dev, struct_size(bank, lock, num_locks),
109
+			    GFP_KERNEL);
110
+	if (!bank)
111
+		return -ENOMEM;
119
112
 
120
113
 	platform_set_drvdata(pdev, bank);
121
114
 
122
115
 	for (i = 0, hwlock = &bank->lock[0]; i < num_locks; i++, hwlock++)
123
116
 		hwlock->priv = io_base + HSEM_REGISTER_OFFSET + sizeof(u32) * i;
124
117
 
125
-	/* no pm needed for HSem but required to comply with hwspilock core */
126
-	pm_runtime_enable(&pdev->dev);
127
-
128
-	ret = hwspin_lock_register(bank, &pdev->dev, &u8500_hwspinlock_ops,
129
-						pdata->base_id, num_locks);
130
-	if (ret)
131
-		goto reg_fail;
132
-
133
-	return 0;
134
-
135
-reg_fail:
136
-	pm_runtime_disable(&pdev->dev);
137
-	kfree(bank);
138
-iounmap_base:
139
-	iounmap(io_base);
140
-	return ret;
118
+	return devm_hwspin_lock_register(&pdev->dev, bank,
119
+					 &u8500_hwspinlock_ops,
120
+					 pdata->base_id, num_locks);
141
121
 }
142
122
 
143
123
 static int u8500_hsem_remove(struct platform_device *pdev)
144
124
 {
145
125
 	struct hwspinlock_device *bank = platform_get_drvdata(pdev);
146
126
 	void __iomem *io_base = bank->lock[0].priv - HSEM_REGISTER_OFFSET;
147
-	int ret;
148
127
 
149
128
 	/* clear all interrupts */
150
129
 	writel(0xFFFF, io_base + HSEM_ICRALL);
151
-
152
-	ret = hwspin_lock_unregister(bank);
153
-	if (ret) {
154
-		dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret);
155
-		return ret;
156
-	}
157
-
158
-	pm_runtime_disable(&pdev->dev);
159
-	iounmap(io_base);
160
-	kfree(bank);
161
130
 
162
131
 	return 0;
163
132
 }