watchdog: davinci_wdt: update to devm_* API
PATCH v2 1/1 watchdog: davinci_wdt: update to devm_* API
Update the code to use devm_* API so that driver
core will manage resources.
---
This patch applies on top of v3.8-rc6.
Tested on da850 EVM.
Changes for V2:
- Use return -EADDRNOTAVAIL in case of devm_request_and_ioremap() fail.
- Use devm_clk_get() instead of clk_get().
- Revert back the change for *dev.
- Removes static type for "wdt_mem" structure as it is used only inside the function now.
:100644 100644 e8e8724... 7df1fdc... M drivers/watchdog/davinci_wdt.c
drivers/watchdog/davinci_wdt.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-)
drivers/watchdog/davinci_wdt.c +6 -23
@@ -69,7 +69,6 @@ static unsigned long wdt_status;#define WDT_REGION_INITED 2#define WDT_DEVICE_INITED 3 -static struct resource *wdt_mem;static void __iomem *wdt_base;struct clk *wdt_clk;
@@ -201,10 +200,11 @@ static struct miscdevice davinci_wdt_miscdev = {static int davinci_wdt_probe (struct platform_device *pdev) { -int ret =0 , size; +int ret =0 ;struct device *dev = &pdev->dev; +struct resource *wdt_mem; - wdt_clk =clk_get (dev,NULL ); + wdt_clk =devm_clk_get (dev,NULL );if (WARN_ON (IS_ERR (wdt_clk)))return PTR_ERR (wdt_clk);
@@ -221,43 +221,26 @@ static int davinci_wdt_probe(struct platform_device *pdev)return -ENOENT ; } - size =resource_size (wdt_mem); -if (!request_mem_region (wdt_mem->start, size, pdev->name)) { -dev_err (dev,"failed to get memory region\n" ); -return -ENOENT ; - } - - wdt_base =ioremap (wdt_mem->start, size); + wdt_base =devm_request_and_ioremap (dev, wdt_mem);if (!wdt_base) { -dev_err (dev,"failed to map memory region\n" ); -release_mem_region (wdt_mem->start, size); - wdt_mem =NULL ; -return -ENOMEM ; +dev_err (dev,"ioremap failed\n" ); +return -EADDRNOTAVAIL ; } ret =misc_register (&davinci_wdt_miscdev);if (ret <0 ) {dev_err (dev,"cannot register misc device\n" ); -release_mem_region (wdt_mem->start, size); - wdt_mem =NULL ; }else {set_bit (WDT_DEVICE_INITED , &wdt_status); } -iounmap (wdt_base);return ret; }static int davinci_wdt_remove (struct platform_device *pdev) {misc_deregister (&davinci_wdt_miscdev); -if (wdt_mem) { -release_mem_region (wdt_mem->start,resource_size (wdt_mem)); - wdt_mem =NULL ; - } -clk_disable_unprepare (wdt_clk); -clk_put (wdt_clk);return 0 ; }
Signature · 1 line
1.7.4.1
Hi,
Quoted 7 lines · Anil
Update the code to use devm_* API so that driver
core will manage resources.Signed-off-by Kumar, Anil <[email protected]>---
This patch applies on top of v3.8-rc6.
Quoted 9 lines
Tested on da850 EVM.
Changes for V2:
- Use return-EADDRNOTAVAILin case ofdevm_request_and_ioremap()fail.
- Usedevm_clk_get()instead ofclk_get().
- Revert back the change for *dev.
- Removes static type for "wdt_mem" structure as it is used only inside the function now.
Gentle Ping. As there are no review comments on this patch, Could you please pull this patch ?
Quoted 81 lines
:100644 100644 e8e8724... 7df1fdc... M
drivers/watchdog/davinci_wdt.cdrivers/watchdog/davinci_wdt.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-)drivers/watchdog/davinci_wdt.c +6
-23@@ -69,7 +69,6 @@ static unsigned long wdt_status;#define WDT_REGION_INITED 2#define WDT_DEVICE_INITED 3 -static struct resource *wdt_mem;static void __iomem *wdt_base;struct clk *wdt_clk;@@ -201,10 +200,11 @@ static struct miscdevice davinci_wdt_miscdev = {static int davinci_wdt_probe (struct platform_device *pdev) { -int ret =0 , size; +int ret =0 ;struct device *dev = &pdev->dev; +struct resource *wdt_mem; - wdt_clk =clk_get (dev,NULL ); + wdt_clk =devm_clk_get (dev,NULL );if (WARN_ON (IS_ERR (wdt_clk)))return PTR_ERR (wdt_clk);@@ -221,43 +221,26 @@ static int davinci_wdt_probe(struct platform_device *pdev)return -ENOENT ; } - size =resource_size (wdt_mem); -if (!request_mem_region (wdt_mem->start, size, pdev->name)) { -dev_err (dev,"failed to get memory region\n" ); -return -ENOENT ; - } - - wdt_base =ioremap (wdt_mem->start, size); + wdt_base =devm_request_and_ioremap (dev, wdt_mem);if (!wdt_base) { -dev_err (dev,"failed to map memory region\n" ); -release_mem_region (wdt_mem->start, size); - wdt_mem =NULL ; -return -ENOMEM ; +dev_err (dev,"ioremap failed\n" ); +return -EADDRNOTAVAIL ; } ret =misc_register (&davinci_wdt_miscdev);if (ret <0 ) {dev_err (dev,"cannot register misc device\n" ); -release_mem_region (wdt_mem->start, size); - wdt_mem =NULL ; }else {set_bit (WDT_DEVICE_INITED , &wdt_status); } -iounmap (wdt_base);return ret; }static int davinci_wdt_remove (struct platform_device *pdev) {misc_deregister (&davinci_wdt_miscdev); -if (wdt_mem) { -release_mem_region (wdt_mem->start,resource_size (wdt_mem)); - wdt_mem =NULL ; - } -clk_disable_unprepare (wdt_clk); -clk_put (wdt_clk);return 0 ; }Signature · 1 line
1.7.4.1
Thanks,
Anil
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please don't send update emails to me
Please don't send update emails to me
Whenever I need I can check from website
Thanks & Regards
Chun-Shian Tsai
----- Original Message ----- From: "Kumar, Anil" <[email protected]>
To: <[email protected]>; <[email protected]>; <[email protected]>
Cc: <[email protected]>
Sent: Monday, February 18, 2013 11:42 AM
Subject: RE: [PATCH V2] watchdog: davinci_wdt: update to devm_* API
Hi,
Quoted 7 lines · Anil
Update the code to use devm_* API so that driver
core will manage resources.Signed-off-by Kumar, Anil <[email protected]>---
This patch applies on top of v3.8-rc6.
Quoted 9 lines
Tested on da850 EVM.
Changes for V2:
- Use return-EADDRNOTAVAILin case ofdevm_request_and_ioremap()fail.
- Usedevm_clk_get()instead ofclk_get().
- Revert back the change for *dev.
- Removes static type for "wdt_mem" structure as it is used only inside the function now.
Gentle Ping. As there are no review comments on this patch, Could you please pull this patch ?
Quoted 77 lines
:100644 100644 e8e8724... 7df1fdc... M
drivers/watchdog/davinci_wdt.cdrivers/watchdog/davinci_wdt.c | 29 ++++++----------------------- 1 files changed, 6 insertions(+), 23 deletions(-)drivers/watchdog/davinci_wdt.c +6
-23@@ -69,7 +69,6 @@ static unsigned long wdt_status;#define WDT_REGION_INITED 2#define WDT_DEVICE_INITED 3 -static struct resource *wdt_mem;static void __iomem *wdt_base;struct clk *wdt_clk;@@ -201,10 +200,11 @@ static struct miscdevice davinci_wdt_miscdev = {static int davinci_wdt_probe (struct platform_device *pdev) { -int ret =0 , size; +int ret =0 ;struct device *dev = &pdev->dev; +struct resource *wdt_mem; - wdt_clk =clk_get (dev,NULL ); + wdt_clk =devm_clk_get (dev,NULL );if (WARN_ON (IS_ERR (wdt_clk)))return PTR_ERR (wdt_clk);@@ -221,43 +221,26 @@ static int davinci_wdt_probe(struct platform_device *pdev)return -ENOENT ; } - size =resource_size (wdt_mem); -if (!request_mem_region (wdt_mem->start, size, pdev->name)) { -dev_err (dev,"failed to get memory region\n" ); -return -ENOENT ; - } - - wdt_base =ioremap (wdt_mem->start, size); + wdt_base =devm_request_and_ioremap (dev, wdt_mem);if (!wdt_base) { -dev_err (dev,"failed to map memory region\n" ); -release_mem_region (wdt_mem->start, size); - wdt_mem =NULL ; -return -ENOMEM ; +dev_err (dev,"ioremap failed\n" ); +return -EADDRNOTAVAIL ; } ret =misc_register (&davinci_wdt_miscdev);if (ret <0 ) {dev_err (dev,"cannot register misc device\n" ); -release_mem_region (wdt_mem->start, size); - wdt_mem =NULL ; }else {set_bit (WDT_DEVICE_INITED , &wdt_status); } -iounmap (wdt_base);return ret; }static int davinci_wdt_remove (struct platform_device *pdev) {misc_deregister (&davinci_wdt_miscdev); -if (wdt_mem) { -release_mem_region (wdt_mem->start,resource_size (wdt_mem)); - wdt_mem =NULL ; - } -clk_disable_unprepare (wdt_clk); -clk_put (wdt_clk);return 0 ;
Quoted 5 lines
}
Signature · 1 line
1.7.4.1
Thanks,
Anil
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
====================================================================
This email may contain confidential information. Please do not use or disclose it in any way and delete it if you are not the intended recipient.
Hi Kumar,
Quoted 4 lines
Update the code to use devm_* API so that driver
core will manage resources.Signed-off-by Kumar, Anil <[email protected]>
Added to linux-watchdog-next.
Kind regards,
Wim.