diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-04 09:04:37 +0000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-04 09:04:37 +0000 |
commit | 685097986b5ef8b8c4b19dbb6a1d6069c3626ba2 (patch) | |
tree | 3222af0faac431c264b9c6baf4cf59020b400e5e /drivers/hwspinlock/stm32_hwspinlock.c | |
parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
parent | hwspinlock: sirf: Use devm_hwspin_lock_register() to register hwlock controller (diff) | |
download | linux-dev-685097986b5ef8b8c4b19dbb6a1d6069c3626ba2.tar.xz linux-dev-685097986b5ef8b8c4b19dbb6a1d6069c3626ba2.zip |
Merge tag 'hwlock-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc
Pull hwspinlock updates from Bjorn Andersson:
"This continues the transition of drivers to device managed resources
and removal of unnecessary PM runtime integration, with cleanups to
the SIRF, OMAP and Qualcomm hwspinlock drivers.
It also adds Baolin as reviewer in MAINTAINERS"
* tag 'hwlock-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc:
hwspinlock: sirf: Use devm_hwspin_lock_register() to register hwlock controller
hwspinlock: sirf: Remove redundant PM runtime functions
hwspinlock: sirf: Change to use devm_platform_ioremap_resource()
hwspinlock: omap: Use devm_kzalloc() to allocate memory
hwspinlock: omap: Change to use devm_platform_ioremap_resource()
hwspinlock: qcom: Use devm_hwspin_lock_register() to register hwlock controller
hwspinlock: qcom: Remove redundant PM runtime functions
hwspinlock: stm32: convert to devm_platform_ioremap_resource
MAINTAINERS: Add myself as reviewer for the hwspinlock subsystem
Diffstat (limited to 'drivers/hwspinlock/stm32_hwspinlock.c')
-rw-r--r-- | drivers/hwspinlock/stm32_hwspinlock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/hwspinlock/stm32_hwspinlock.c b/drivers/hwspinlock/stm32_hwspinlock.c index c8eacf4f9692..3ad0ce0da4d9 100644 --- a/drivers/hwspinlock/stm32_hwspinlock.c +++ b/drivers/hwspinlock/stm32_hwspinlock.c @@ -58,12 +58,10 @@ static int stm32_hwspinlock_probe(struct platform_device *pdev) { struct stm32_hwspinlock *hw; void __iomem *io_base; - struct resource *res; size_t array_size; int i, ret; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - io_base = devm_ioremap_resource(&pdev->dev, res); + io_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(io_base)) return PTR_ERR(io_base); |