.. | .. |
---|
22 | 22 | }; |
---|
23 | 23 | MODULE_DEVICE_TABLE(of, fpga_region_of_match); |
---|
24 | 24 | |
---|
25 | | -static int fpga_region_of_node_match(struct device *dev, const void *data) |
---|
26 | | -{ |
---|
27 | | - return dev->of_node == data; |
---|
28 | | -} |
---|
29 | | - |
---|
30 | 25 | /** |
---|
31 | 26 | * of_fpga_region_find - find FPGA region |
---|
32 | 27 | * @np: device node of FPGA Region |
---|
.. | .. |
---|
37 | 32 | */ |
---|
38 | 33 | static struct fpga_region *of_fpga_region_find(struct device_node *np) |
---|
39 | 34 | { |
---|
40 | | - return fpga_region_class_find(NULL, np, fpga_region_of_node_match); |
---|
| 35 | + return fpga_region_class_find(NULL, np, device_match_of_node); |
---|
41 | 36 | } |
---|
42 | 37 | |
---|
43 | 38 | /** |
---|
.. | .. |
---|
410 | 405 | if (IS_ERR(mgr)) |
---|
411 | 406 | return -EPROBE_DEFER; |
---|
412 | 407 | |
---|
413 | | - region = fpga_region_create(dev, mgr, of_fpga_region_get_bridges); |
---|
| 408 | + region = devm_fpga_region_create(dev, mgr, of_fpga_region_get_bridges); |
---|
414 | 409 | if (!region) { |
---|
415 | 410 | ret = -ENOMEM; |
---|
416 | 411 | goto eprobe_mgr_put; |
---|
.. | .. |
---|
418 | 413 | |
---|
419 | 414 | ret = fpga_region_register(region); |
---|
420 | 415 | if (ret) |
---|
421 | | - goto eprobe_free; |
---|
| 416 | + goto eprobe_mgr_put; |
---|
422 | 417 | |
---|
423 | 418 | of_platform_populate(np, fpga_region_of_match, NULL, ®ion->dev); |
---|
424 | | - dev_set_drvdata(dev, region); |
---|
| 419 | + platform_set_drvdata(pdev, region); |
---|
425 | 420 | |
---|
426 | 421 | dev_info(dev, "FPGA Region probed\n"); |
---|
427 | 422 | |
---|
428 | 423 | return 0; |
---|
429 | 424 | |
---|
430 | | -eprobe_free: |
---|
431 | | - fpga_region_free(region); |
---|
432 | 425 | eprobe_mgr_put: |
---|
433 | 426 | fpga_mgr_put(mgr); |
---|
434 | 427 | return ret; |
---|