Skip to content

Commit 7a3cffa

Browse files
mvduinRobertCNelson
authored andcommitted
uio_pruss: minor cleanup
Signed-off-by: Matthijs van Duin <[email protected]>
1 parent df864e6 commit 7a3cffa

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

drivers/uio/uio_pruss.c

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -176,26 +176,26 @@ static int pruss_probe(struct platform_device *pdev)
176176
}
177177
#endif
178178

179-
if (pdev->dev.of_node) {
180-
pm_runtime_enable(&pdev->dev);
181-
ret = pm_runtime_get_sync(&pdev->dev);
179+
if (dev->of_node) {
180+
pm_runtime_enable(dev);
181+
ret = pm_runtime_get_sync(dev);
182182
if (IS_ERR_VALUE(ret)) {
183-
dev_err(&pdev->dev, "pm_runtime_get_sync() failed\n");
183+
dev_err(dev, "pm_runtime_get_sync() failed\n");
184184
return ret;
185185
}
186186

187-
ret = of_address_to_resource(pdev->dev.of_node, 0, &res);
187+
ret = of_address_to_resource(dev->of_node, 0, &res);
188188
if (IS_ERR_VALUE(ret)) {
189-
dev_err(&pdev->dev, "failed to parse DT reg\n");
189+
dev_err(dev, "failed to parse DT reg\n");
190190
return ret;
191191
}
192192
regs_prussio = &res;
193-
}
194-
else
193+
} else {
195194
regs_prussio = platform_get_resource(pdev, IORESOURCE_MEM, 0);
196-
if (!regs_prussio) {
197-
dev_err(dev, "No PRUSS I/O resource specified\n");
198-
goto out_free;
195+
if (!regs_prussio) {
196+
dev_err(dev, "No PRUSS I/O resource specified\n");
197+
goto out_free;
198+
}
199199
}
200200

201201
if (!regs_prussio->start) {
@@ -216,30 +216,30 @@ static int pruss_probe(struct platform_device *pdev)
216216
* - Matthijs van Duin
217217
*/
218218
#if 0
219-
pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
219+
pinctrl = devm_pinctrl_get_select_default(dev);
220220
if (IS_ERR(pinctrl))
221-
dev_warn(&pdev->dev,
221+
dev_warn(dev,
222222
"pins are not configured from the driver\n");
223223
else{
224-
count = of_get_child_count(pdev->dev.of_node);
224+
count = of_get_child_count(dev->of_node);
225225
if (!count){
226-
dev_info(&pdev->dev, "No children\n");
226+
dev_info(dev, "No children\n");
227227
return -ENODEV;
228228
}
229229
// Run through all children. They have lables for easy reference.
230-
for_each_child_of_node(pdev->dev.of_node, child){
230+
for_each_child_of_node(dev->of_node, child){
231231
enum of_gpio_flags flags;
232232
unsigned gpio;
233233

234234
count = of_gpio_count(child);
235235

236236
ret = of_property_count_strings(child, "pin-names");
237237
if (ret < 0) {
238-
dev_err(&pdev->dev, "Failed to get pin-names\n");
238+
dev_err(dev, "Failed to get pin-names\n");
239239
continue;
240240
}
241241
if(count != ret){
242-
dev_err(&pdev->dev, "The number of gpios (%d) does not match"\
242+
dev_err(dev, "The number of gpios (%d) does not match"\
243243
" the number of pin names (%d)\n", count, ret);
244244
continue;
245245
}
@@ -248,9 +248,9 @@ static int pruss_probe(struct platform_device *pdev)
248248
ret = of_property_read_string_index(child,
249249
"pin-names", cnt, &pin_name);
250250
if (ret != 0)
251-
dev_err(&pdev->dev, "Error on pin-name #%d\n", cnt);
251+
dev_err(dev, "Error on pin-name #%d\n", cnt);
252252
gpio = of_get_gpio_flags(child, cnt, &flags);
253-
ret = devm_gpio_request_one(&pdev->dev, gpio, flags, pin_name);
253+
ret = devm_gpio_request_one(dev, gpio, flags, pin_name);
254254
if (ret < 0) {
255255
dev_err(dev, "Failed to request GPIO %d (%s) flags: '%d', error %d\n",
256256
gpio, pin_name, flags, ret);
@@ -286,13 +286,12 @@ static int pruss_probe(struct platform_device *pdev)
286286
goto out_free;
287287
}
288288

289-
if (pdev->dev.of_node) {
290-
ret = of_property_read_u32(pdev->dev.of_node,
289+
if (dev->of_node) {
290+
ret = of_property_read_u32(dev->of_node,
291291
"ti,pintc-offset",
292292
&gdev->pintc_base);
293293
if (ret < 0) {
294-
dev_err(&pdev->dev,
295-
"Can't parse ti,pintc-offset property\n");
294+
dev_err(dev, "Can't parse ti,pintc-offset property\n");
296295
goto out_free;
297296
}
298297
} else

0 commit comments

Comments
 (0)