Optimize the u8500_hsem hwlock driver
cover Optimize the u8500_hsem hwlock driver
This patch set did some Optimization with changing to use devm_xxx() APIs to simplify the code and make code more readable.
Baolin Wang (3):
hwspinlock: u8500_hsem: Change to use
devm_platform_ioremap_resource()
hwspinlock: u8500_hsem: Use devm_kzalloc() to allocate memory
hwspinlock: u8500_hsem: Use devm_hwspin_lock_register() to register
hwlock controller
drivers/hwspinlock/u8500_hsem.c | 46 +++++++++++---------------------------- 1 file changed, 13 insertions(+), 33 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/3 hwspinlock: u8500_hsem: Change to use devm_platform_ioremap_resource()
Use the new helper that wraps the calls to platform_get_resource() and devm_ioremap_resource() together, which can simpify the code.
--- drivers/hwspinlock/u8500_hsem.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/hwspinlock/u8500_hsem.c +5 -15
@@ -88,7 +88,6 @@ static int u8500_hsem_probe(struct platform_device *pdev)struct hwspinlock_pdata *pdata = pdev->dev.platform_data;struct hwspinlock_device *bank;struct hwspinlock *hwlock; -struct resource *res;void __iomem *io_base;int i, ret, num_locks =U8500_MAX_SEMAPHORE ;ulong val;
@@ -96,13 +95,9 @@ static int u8500_hsem_probe(struct platform_device *pdev)if (!pdata)return -ENODEV ; - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -ENODEV ; - - io_base =ioremap (res->start,resource_size (res)); -if (!io_base) -return -ENOMEM ; + io_base =devm_platform_ioremap_resource (pdev,0 ); +if (IS_ERR (io_base)) +return PTR_ERR (io_base);/* make sure protocol 1 is selected */ val =readl (io_base +HSEM_CTRL_REG );
@@ -112,10 +107,8 @@ static int u8500_hsem_probe(struct platform_device *pdev)writel (0xFFFF , io_base +HSEM_ICRALL ); bank =kzalloc (struct_size (bank, lock, num_locks),GFP_KERNEL ); -if (!bank) { - ret = -ENOMEM ; - goto iounmap_base; - } +if (!bank) +return -ENOMEM ;platform_set_drvdata (pdev, bank);
@@ -135,8 +128,6 @@ static int u8500_hsem_probe(struct platform_device *pdev) reg_fail:pm_runtime_disable (&pdev->dev);kfree (bank); -iounmap_base: -iounmap (io_base);return ret; }
@@ -156,7 +147,6 @@ static int u8500_hsem_remove(struct platform_device *pdev) }pm_runtime_disable (&pdev->dev); -iounmap (io_base);kfree (bank);return 0 ;
Signature · 1 line
1.7.9.5
Re: [PATCH 1/3] hwspinlock: u8500_hsem: Change to use devm_platform_ioremap_resource()
Quoted 4 lines · Baolin Wang
Use the new helper that wraps the calls to
platform_get_resource()anddevm_ioremap_resource()together, which can simpify the code.Signed-off-by Baolin Wang <[email protected]>
Yours,
Linus Walleij
PATCH 2/3 hwspinlock: u8500_hsem: Use devm_kzalloc() to allocate memory
In reply to Baolin WangUse devm_kzalloc() to allocate memory.
--- drivers/hwspinlock/u8500_hsem.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-)
drivers/hwspinlock/u8500_hsem.c +6 -9
@@ -106,7 +106,8 @@ static int u8500_hsem_probe(struct platform_device *pdev)/* clear all interrupts */ writel (0xFFFF , io_base +HSEM_ICRALL ); - bank =kzalloc (struct_size (bank, lock, num_locks),GFP_KERNEL ); + bank =devm_kzalloc (&pdev->dev,struct_size (bank, lock, num_locks), +GFP_KERNEL );if (!bank)return -ENOMEM ;
@@ -120,15 +121,12 @@ static int u8500_hsem_probe(struct platform_device *pdev) ret =hwspin_lock_register (bank, &pdev->dev, &u8500_hwspinlock_ops, pdata->base_id, num_locks); -if (ret) - goto reg_fail; +if (ret) { +pm_runtime_disable (&pdev->dev); +return ret; + }return 0 ; - -reg_fail: -pm_runtime_disable (&pdev->dev); -kfree (bank); -return ret; }static int u8500_hsem_remove (struct platform_device *pdev)
@@ -147,7 +145,6 @@ static int u8500_hsem_remove(struct platform_device *pdev) }pm_runtime_disable (&pdev->dev); -kfree (bank);return 0 ; }
Signature · 1 line
1.7.9.5
Re: [PATCH 2/3] hwspinlock: u8500_hsem: Use devm_kzalloc() to allocate memory
Quoted 3 lines · Baolin Wang
Use
devm_kzalloc()to allocate memory.Signed-off-by Baolin Wang <[email protected]>
Yours,
Linus Walleij
PATCH 3/3 hwspinlock: u8500_hsem: Use devm_hwspin_lock_register() to register hwlock controller
In reply to Baolin WangUse devm_hwspin_lock_register() to register the hwlock controller instead of unregistering the hwlock controller explicitly when removing the device.
--- drivers/hwspinlock/u8500_hsem.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
drivers/hwspinlock/u8500_hsem.c +2 -9
@@ -119,8 +119,8 @@ static int u8500_hsem_probe(struct platform_device *pdev)/* no pm needed for HSem but required to comply with hwspilock core */ pm_runtime_enable (&pdev->dev); - ret =hwspin_lock_register (bank, &pdev->dev, &u8500_hwspinlock_ops, - pdata->base_id, num_locks); + ret =devm_hwspin_lock_register (&pdev->dev, bank, &u8500_hwspinlock_ops, + pdata->base_id, num_locks);if (ret) {pm_runtime_disable (&pdev->dev);return ret;
@@ -133,17 +133,10 @@ static int u8500_hsem_remove(struct platform_device *pdev) {struct hwspinlock_device *bank =platform_get_drvdata (pdev);void __iomem *io_base = bank->lock[0 ].priv -HSEM_REGISTER_OFFSET ; -int ret;/* clear all interrupts */ writel (0xFFFF , io_base +HSEM_ICRALL ); - ret =hwspin_lock_unregister (bank); -if (ret) { -dev_err (&pdev->dev,"%s failed: %d\n" , __func__, ret); -return ret; - } -pm_runtime_disable (&pdev->dev);return 0 ;
Signature · 1 line
1.7.9.5
Re: [PATCH 3/3] hwspinlock: u8500_hsem: Use devm_hwspin_lock_register() to register hwlock controller
Quoted 4 lines · Baolin Wang
Use
devm_hwspin_lock_register()to register the hwlock controller instead of unregistering the hwlock controller explicitly when removing the device.Signed-off-by Baolin Wang <[email protected]>
Yours,
Linus Walleij
Bjorn Andersson
AppliedQuoted 3 lines · Baolin Wang
This patch set did some Optimization with changing to use
devm_xxx()APIs to simplify the code and make code more readable.
Applied, with Linus' r-b
Thanks,
Bjorn
Quoted 13 lines
Baolin Wang (3):
hwspinlock:u8500_hsem: Change to use
devm_platform_ioremap_resource()
hwspinlock:u8500_hsem: Usedevm_kzalloc()to allocate memory
hwspinlock:u8500_hsem: Usedevm_hwspin_lock_register()to register
hwlock controllerdrivers/hwspinlock/u8500_hsem.c | 46 +++++++++++---------------------------- 1 file changed, 13 insertions(+), 33 deletions(-)Signature · 1 line
1.7.9.5