watchdog: ep93xx_wdt: Use devm_ioremap_resource()
PATCH 1/3 watchdog: ep93xx_wdt: Use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler, and remove redundant return value check of platform_get_resource() because the value is checked by devm_ioremap_resource().
--- drivers/watchdog/ep93xx_wdt.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)
drivers/watchdog/ep93xx_wdt.c +3 -10
@@ -118,16 +118,9 @@ static int ep93xx_wdt_probe(struct platform_device *pdev)int err; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -ENXIO ; - -if (!devm_request_mem_region (&pdev->dev, res->start, -resource_size (res), pdev->name)) -return -EBUSY ; - - mmio_base =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (!mmio_base) -return -ENXIO ; + mmio_base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (mmio_base)) +return PTR_ERR (mmio_base);if (timeout <1 || timeout >3600 ) { timeout =WDT_TIMEOUT ;
Signature · 1 line
1.7.10.4
PATCH 2/3 watchdog: omap_wdt: Use devm_ioremap_resource()
Use devm_ioremap_resource() in order to make the code simpler, and remove 'struct resource *mem' from 'struct omap_wdt_dev' and omap_wdt_probe(), resplectively. because the 'mem' variables are not used anymore. Also the redundant return value check of platform_get_resource() is removed, because the value is checked by devm_ioremap_resource().
--- drivers/watchdog/omap_wdt.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
drivers/watchdog/omap_wdt.c +6 -16
@@ -58,7 +58,6 @@ struct omap_wdt_dev {void __iomem *base;/* physical */ struct device *dev;bool omap_wdt_users; -struct resource *mem;int wdt_trgr_pattern;struct mutex lock;/* to avoid races with PM */ };
@@ -207,7 +206,7 @@ static int omap_wdt_probe(struct platform_device *pdev) {struct omap_wd_timer_platform_data *pdata =dev_get_platdata (&pdev->dev);struct watchdog_device *omap_wdt; -struct resource *res, *mem; +struct resource *res;struct omap_wdt_dev *wdev;u32 rs;int ret;
@@ -216,29 +215,20 @@ static int omap_wdt_probe(struct platform_device *pdev)if (!omap_wdt)return -ENOMEM ; -/* reserve static register mappings */ - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -ENOENT ; - - mem =devm_request_mem_region (&pdev->dev, res->start, -resource_size (res), pdev->name); -if (!mem) -return -EBUSY ; - wdev =devm_kzalloc (&pdev->dev,sizeof (*wdev),GFP_KERNEL );if (!wdev)return -ENOMEM ; wdev->omap_wdt_users = false; - wdev->mem = mem; wdev->dev = &pdev->dev; wdev->wdt_trgr_pattern =0x1234 ;mutex_init (&wdev->lock); - wdev->base =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (!wdev->base) -return -ENOMEM ; +/* reserve static register mappings */ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + wdev->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (wdev->base)) +return PTR_ERR (wdev->base); omap_wdt->info = &omap_wdt_info; omap_wdt->ops = &omap_wdt_ops;
Signature · 1 line
1.7.10.4
Re: [PATCH 2/3] watchdog: omap_wdt: Use devm_ioremap_resource()
Quoted 8 lines · Jingoo Han
Use
devm_ioremap_resource()in order to make the code simpler, and remove 'struct resource *mem' from 'structomap_wdt_dev' andomap_wdt_probe(), resplectively. because the 'mem' variables are not used anymore. Also the redundant return value check ofplatform_get_resource()is removed, because the value is checked bydevm_ioremap_resource().Signed-off-by Jingoo Han <[email protected]>
Re: [PATCH 2/3] watchdog: omap_wdt: Use devm_ioremap_resource()
In reply to Jingoo HanQuoted 8 lines · Jingoo Han
Use
devm_ioremap_resource()in order to make the code simpler, and remove 'struct resource *mem' from 'structomap_wdt_dev' andomap_wdt_probe(), resplectively. because the 'mem' variables are not used anymore. Also the redundant return value check ofplatform_get_resource()is removed, because the value is checked bydevm_ioremap_resource().Signed-off-by Jingoo Han <[email protected]>
A.
Re: [PATCH 2/3] watchdog: omap_wdt: Use devm_ioremap_resource()
In reply to Jingoo HanHi Jingoo,
Quoted 72 lines
Use
devm_ioremap_resource()in order to make the code simpler, and remove 'struct resource *mem' from 'structomap_wdt_dev' andomap_wdt_probe(), resplectively. because the 'mem' variables are not used anymore. Also the redundant return value check ofplatform_get_resource()is removed, because the value is checked bydevm_ioremap_resource().Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/omap_wdt.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)drivers/watchdog/omap_wdt.c +6
-16@@ -58,7 +58,6 @@ struct omap_wdt_dev {void __iomem *base;/* physical */ struct device *dev;bool omap_wdt_users; -struct resource *mem;int wdt_trgr_pattern;struct mutex lock;/* to avoid races with PM */ };@@ -207,7 +206,7 @@ static int omap_wdt_probe(struct platform_device *pdev) {struct omap_wd_timer_platform_data *pdata =dev_get_platdata (&pdev->dev);struct watchdog_device *omap_wdt; -struct resource *res, *mem; +struct resource *res;struct omap_wdt_dev *wdev;u32 rs;int ret;@@ -216,29 +215,20 @@ static int omap_wdt_probe(struct platform_device *pdev)if (!omap_wdt)return -ENOMEM ; -/* reserve static register mappings */ - res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -ENOENT ; - - mem =devm_request_mem_region (&pdev->dev, res->start, -resource_size (res), pdev->name); -if (!mem) -return -EBUSY ; - wdev =devm_kzalloc (&pdev->dev,sizeof (*wdev),GFP_KERNEL );if (!wdev)return -ENOMEM ; wdev->omap_wdt_users = false; - wdev->mem = mem; wdev->dev = &pdev->dev; wdev->wdt_trgr_pattern =0x1234 ;mutex_init (&wdev->lock); - wdev->base =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (!wdev->base) -return -ENOMEM ; +/* reserve static register mappings */ + res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); + wdev->base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (wdev->base)) +return PTR_ERR (wdev->base); omap_wdt->info = &omap_wdt_info; omap_wdt->ops = &omap_wdt_ops;Signature · 1 line
1.7.10.4
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
PATCH 3/3 watchdog: sp805_wdt: Use devm_ioremap_resource()
In reply to Jingoo HanUse devm_ioremap_resource() in order to make the code simpler.
--- drivers/watchdog/sp805_wdt.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)
drivers/watchdog/sp805_wdt.c +3 -14
@@ -209,13 +209,6 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)struct sp805_wdt *wdt;int ret =0 ; -if (!devm_request_mem_region (&adev->dev, adev->res.start, -resource_size (&adev->res),"sp805_wdt" )) { -dev_warn (&adev->dev,"Failed to get memory region resource\n" ); - ret = -ENOENT ; - goto err; - } - wdt =devm_kzalloc (&adev->dev,sizeof (*wdt),GFP_KERNEL );if (!wdt) {dev_warn (&adev->dev,"Kzalloc failed\n" );
@@ -223,13 +216,9 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id) goto err; } - wdt->base =devm_ioremap (&adev->dev, adev->res.start, -resource_size (&adev->res)); -if (!wdt->base) { - ret = -ENOMEM ; -dev_warn (&adev->dev,"ioremap fail\n" ); - goto err; - } + wdt->base =devm_ioremap_resource (&adev->dev, &adev->res); +if (IS_ERR (wdt->base)) +return PTR_ERR (wdt->base); wdt->clk =devm_clk_get (&adev->dev,NULL );if (IS_ERR (wdt->clk)) {
Signature · 1 line
1.7.10.4
Re: [PATCH 3/3] watchdog: sp805_wdt: Use devm_ioremap_resource()
Quoted 3 lines · Jingoo Han
Use
devm_ioremap_resource()in order to make the code simpler.Signed-off-by Jingoo Han <[email protected]>
Re: [PATCH 3/3] watchdog: sp805_wdt: Use devm_ioremap_resource()
In reply to Jingoo HanHi Jingoo,
Quoted 46 lines
Use
devm_ioremap_resource()in order to make the code simpler.Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/sp805_wdt.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-)drivers/watchdog/sp805_wdt.c +3
-14@@ -209,13 +209,6 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id)struct sp805_wdt *wdt;int ret =0 ; -if (!devm_request_mem_region (&adev->dev, adev->res.start, -resource_size (&adev->res),"sp805_wdt" )) { -dev_warn (&adev->dev,"Failed to get memory region resource\n" ); - ret = -ENOENT ; - goto err; - } - wdt =devm_kzalloc (&adev->dev,sizeof (*wdt),GFP_KERNEL );if (!wdt) {dev_warn (&adev->dev,"Kzalloc failed\n" );@@ -223,13 +216,9 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id) goto err; } - wdt->base =devm_ioremap (&adev->dev, adev->res.start, -resource_size (&adev->res)); -if (!wdt->base) { - ret = -ENOMEM ; -dev_warn (&adev->dev,"ioremap fail\n" ); - goto err; - } + wdt->base =devm_ioremap_resource (&adev->dev, &adev->res); +if (IS_ERR (wdt->base)) +return PTR_ERR (wdt->base); wdt->clk =devm_clk_get (&adev->dev,NULL );if (IS_ERR (wdt->clk)) {Signature · 1 line
1.7.10.4
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.
Quoted 5 lines · Jingoo Han
Use
devm_ioremap_resource()in order to make the code simpler, and remove redundant return value check ofplatform_get_resource()because the value is checked bydevm_ioremap_resource().Signed-off-by Jingoo Han <[email protected]>
Hi Jingoo,
Quoted 37 lines
Use
devm_ioremap_resource()in order to make the code simpler, and remove redundant return value check ofplatform_get_resource()because the value is checked bydevm_ioremap_resource().Signed-off-by Jingoo Han <[email protected]>--- drivers/watchdog/ep93xx_wdt.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-)drivers/watchdog/ep93xx_wdt.c +3
-10@@ -118,16 +118,9 @@ static int ep93xx_wdt_probe(struct platform_device *pdev)int err; res =platform_get_resource (pdev,IORESOURCE_MEM ,0 ); -if (!res) -return -ENXIO ; - -if (!devm_request_mem_region (&pdev->dev, res->start, -resource_size (res), pdev->name)) -return -EBUSY ; - - mmio_base =devm_ioremap (&pdev->dev, res->start,resource_size (res)); -if (!mmio_base) -return -ENXIO ; + mmio_base =devm_ioremap_resource (&pdev->dev, res); +if (IS_ERR (mmio_base)) +return PTR_ERR (mmio_base);if (timeout <1 || timeout >3600 ) { timeout =WDT_TIMEOUT ;Signature · 1 line
1.7.10.4
This patch has been added to linux-watchdog-next.
Kind regards,
Wim.