.. | .. |
---|
39 | 39 | if (IS_ERR(mgr)) |
---|
40 | 40 | return -EPROBE_DEFER; |
---|
41 | 41 | |
---|
42 | | - region = fpga_region_create(dev, mgr, fme_region_get_bridges); |
---|
| 42 | + region = devm_fpga_region_create(dev, mgr, fme_region_get_bridges); |
---|
43 | 43 | if (!region) { |
---|
44 | 44 | ret = -ENOMEM; |
---|
45 | 45 | goto eprobe_mgr_put; |
---|
.. | .. |
---|
51 | 51 | |
---|
52 | 52 | ret = fpga_region_register(region); |
---|
53 | 53 | if (ret) |
---|
54 | | - goto region_free; |
---|
| 54 | + goto eprobe_mgr_put; |
---|
55 | 55 | |
---|
56 | 56 | dev_dbg(dev, "DFL FME FPGA Region probed\n"); |
---|
57 | 57 | |
---|
58 | 58 | return 0; |
---|
59 | 59 | |
---|
60 | | -region_free: |
---|
61 | | - fpga_region_free(region); |
---|
62 | 60 | eprobe_mgr_put: |
---|
63 | 61 | fpga_mgr_put(mgr); |
---|
64 | 62 | return ret; |
---|
.. | .. |
---|
66 | 64 | |
---|
67 | 65 | static int fme_region_remove(struct platform_device *pdev) |
---|
68 | 66 | { |
---|
69 | | - struct fpga_region *region = dev_get_drvdata(&pdev->dev); |
---|
| 67 | + struct fpga_region *region = platform_get_drvdata(pdev); |
---|
70 | 68 | struct fpga_manager *mgr = region->mgr; |
---|
71 | 69 | |
---|
72 | 70 | fpga_region_unregister(region); |
---|