.. | .. |
---|
5 | 5 | #include <linux/module.h> |
---|
6 | 6 | #include <linux/device.h> |
---|
7 | 7 | #include <linux/io.h> |
---|
8 | | -#include <linux/pm_runtime.h> |
---|
9 | 8 | #include <linux/slab.h> |
---|
10 | | -#include <linux/spinlock.h> |
---|
11 | 9 | #include <linux/hwspinlock.h> |
---|
12 | 10 | #include <linux/platform_device.h> |
---|
13 | 11 | #include <linux/of.h> |
---|
14 | | -#include <linux/of_address.h> |
---|
15 | 12 | |
---|
16 | 13 | #include "hwspinlock_internal.h" |
---|
17 | 14 | |
---|
.. | .. |
---|
59 | 56 | { |
---|
60 | 57 | struct rockchip_hwspinlock *hwspin; |
---|
61 | 58 | struct hwspinlock *hwlock; |
---|
62 | | - struct resource *res; |
---|
63 | | - int idx, ret; |
---|
| 59 | + int idx; |
---|
64 | 60 | |
---|
65 | | - if (!pdev->dev.of_node) |
---|
66 | | - return -ENODEV; |
---|
67 | | - |
---|
68 | | - hwspin = devm_kzalloc(&pdev->dev, sizeof(*hwspin) + |
---|
69 | | - sizeof(*hwlock) * HWSPINLOCK_NUMBER, GFP_KERNEL); |
---|
| 61 | + hwspin = devm_kzalloc(&pdev->dev, |
---|
| 62 | + struct_size(hwspin, bank.lock, HWSPINLOCK_NUMBER), |
---|
| 63 | + GFP_KERNEL); |
---|
70 | 64 | if (!hwspin) |
---|
71 | 65 | return -ENOMEM; |
---|
72 | 66 | |
---|
73 | | - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
---|
74 | | - hwspin->io_base = devm_ioremap_resource(&pdev->dev, res); |
---|
| 67 | + hwspin->io_base = devm_platform_ioremap_resource(pdev, 0); |
---|
75 | 68 | if (IS_ERR(hwspin->io_base)) |
---|
76 | 69 | return PTR_ERR(hwspin->io_base); |
---|
77 | 70 | |
---|
.. | .. |
---|
82 | 75 | |
---|
83 | 76 | platform_set_drvdata(pdev, hwspin); |
---|
84 | 77 | |
---|
85 | | - pm_runtime_enable(&pdev->dev); |
---|
86 | | - |
---|
87 | | - ret = hwspin_lock_register(&hwspin->bank, &pdev->dev, |
---|
88 | | - &rockchip_hwspinlock_ops, 0, |
---|
89 | | - HWSPINLOCK_NUMBER); |
---|
90 | | - if (ret) |
---|
91 | | - goto reg_fail; |
---|
92 | | - |
---|
93 | | - return 0; |
---|
94 | | - |
---|
95 | | -reg_fail: |
---|
96 | | - pm_runtime_disable(&pdev->dev); |
---|
97 | | - iounmap(hwspin->io_base); |
---|
98 | | - |
---|
99 | | - return ret; |
---|
100 | | -} |
---|
101 | | - |
---|
102 | | -static int rockchip_hwspinlock_remove(struct platform_device *pdev) |
---|
103 | | -{ |
---|
104 | | - struct rockchip_hwspinlock *hwspin = platform_get_drvdata(pdev); |
---|
105 | | - int ret; |
---|
106 | | - |
---|
107 | | - ret = hwspin_lock_unregister(&hwspin->bank); |
---|
108 | | - if (ret) { |
---|
109 | | - dev_err(&pdev->dev, "%s failed: %d\n", __func__, ret); |
---|
110 | | - return ret; |
---|
111 | | - } |
---|
112 | | - |
---|
113 | | - pm_runtime_disable(&pdev->dev); |
---|
114 | | - |
---|
115 | | - iounmap(hwspin->io_base); |
---|
116 | | - |
---|
117 | | - return 0; |
---|
| 78 | + return devm_hwspin_lock_register(&pdev->dev, &hwspin->bank, |
---|
| 79 | + &rockchip_hwspinlock_ops, 0, |
---|
| 80 | + HWSPINLOCK_NUMBER); |
---|
118 | 81 | } |
---|
119 | 82 | |
---|
120 | 83 | static const struct of_device_id rockchip_hwpinlock_ids[] = { |
---|
.. | .. |
---|
125 | 88 | |
---|
126 | 89 | static struct platform_driver rockchip_hwspinlock_driver = { |
---|
127 | 90 | .probe = rockchip_hwspinlock_probe, |
---|
128 | | - .remove = rockchip_hwspinlock_remove, |
---|
129 | 91 | .driver = { |
---|
130 | 92 | .name = "rockchip_hwspinlock", |
---|
131 | 93 | .of_match_table = of_match_ptr(rockchip_hwpinlock_ids), |
---|