When converting this driver to devm_ioremap_resource, the removal of this now
unneeded function has been forgotten.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/char/hw_random/omap-rng.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/char/hw_random/omap-rng.c b/drivers/char/hw_random/omap-rng.c
index d2903e7..7af2b24 100644
--- a/drivers/char/hw_random/omap-rng.c
+++ b/drivers/char/hw_random/omap-rng.c
@@ -52,7 +52,6 @@
*/
struct omap_rng_private_data {
void __iomem *base;
- struct resource *mem_res;
};
static inline u32 omap_rng_read_reg(struct omap_rng_private_data *priv, int reg)
@@ -107,6 +106,7 @@ static struct hwrng omap_rng_ops = {
static int omap_rng_probe(struct platform_device *pdev)
{
struct omap_rng_private_data *priv;
+ struct resource *mem_res;
int ret;
priv = kzalloc(sizeof(struct omap_rng_private_data), GFP_KERNEL);
@@ -118,8 +118,8 @@ static int omap_rng_probe(struct platform_device *pdev)
omap_rng_ops.priv = (unsigned long)priv;
dev_set_drvdata(&pdev->dev, priv);
- priv->mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- priv->base = devm_ioremap_resource(&pdev->dev, priv->mem_res);
+ mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ priv->base = devm_ioremap_resource(&pdev->dev, mem_res);
if (IS_ERR(priv->base)) {
ret = PTR_ERR(priv->base);
goto err_ioremap;
@@ -160,8 +160,6 @@ static int __exit omap_rng_remove(struct platform_device *pdev)
pm_runtime_put_sync(&pdev->dev);
pm_runtime_disable(&pdev->dev);
- release_mem_region(priv->mem_res->start, resource_size(priv->mem_res));
-
kfree(priv);
return 0;
--
1.7.10.4
When converting this driver to devm_ioremap_resource, the removal of this now
unneeded function has been forgotten.
Signed-off-by: Wolfram Sang <[email protected]>
---
sound/soc/fsl/imx-ssi.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index c6fa03e..404314d 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -627,7 +627,6 @@ failed_pdev_fiq_add:
failed_pdev_fiq_alloc:
snd_soc_unregister_component(&pdev->dev);
failed_register:
- release_mem_region(res->start, resource_size(res));
clk_disable_unprepare(ssi->clk);
failed_clk:
@@ -636,7 +635,6 @@ failed_clk:
static int imx_ssi_remove(struct platform_device *pdev)
{
- struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
struct imx_ssi *ssi = platform_get_drvdata(pdev);
platform_device_unregister(ssi->soc_platform_pdev);
@@ -647,7 +645,6 @@ static int imx_ssi_remove(struct platform_device *pdev)
if (ssi->flags & IMX_SSI_USE_AC97)
ac97_ssi = NULL;
- release_mem_region(res->start, resource_size(res));
clk_disable_unprepare(ssi->clk);
return 0;
--
1.7.10.4
When converting this driver to devm_ioremap_resource, the removal of this now
unneeded function has been forgotten.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/usb/host/ohci-nxp.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
index f303cb0..f1db7eb 100644
--- a/drivers/usb/host/ohci-nxp.c
+++ b/drivers/usb/host/ohci-nxp.c
@@ -351,7 +351,6 @@ static int usb_hcd_nxp_remove(struct platform_device *pdev)
usb_remove_hcd(hcd);
nxp_stop_hc();
- release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
usb_put_hcd(hcd);
clk_disable(usb_pll_clk);
clk_put(usb_pll_clk);
--
1.7.10.4
On Wed, 22 May 2013, Wolfram Sang wrote:
> When converting this driver to devm_ioremap_resource, the removal of this now
> unneeded function has been forgotten.
>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> drivers/usb/host/ohci-nxp.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c
> index f303cb0..f1db7eb 100644
> --- a/drivers/usb/host/ohci-nxp.c
> +++ b/drivers/usb/host/ohci-nxp.c
> @@ -351,7 +351,6 @@ static int usb_hcd_nxp_remove(struct platform_device *pdev)
>
> usb_remove_hcd(hcd);
> nxp_stop_hc();
> - release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
> usb_put_hcd(hcd);
> clk_disable(usb_pll_clk);
> clk_put(usb_pll_clk);
Acked-by: Alan Stern <[email protected]>
On Wed, May 22, 2013 at 03:21:26PM +0200, Wolfram Sang wrote:
> When converting this driver to devm_ioremap_resource, the removal of this now
> unneeded function has been forgotten.
This doesn't apply against current code, can you please regenerate
against topic/fsl or mainline?
On Wed, May 22, 2013 at 10:56:28AM -0500, Mark Brown wrote:
> On Wed, May 22, 2013 at 03:21:26PM +0200, Wolfram Sang wrote:
> > When converting this driver to devm_ioremap_resource, the removal of this now
> > unneeded function has been forgotten.
>
> This doesn't apply against current code, can you please regenerate
> against topic/fsl or mainline?
? Works fine against v3.10-rc2 here. Or is mainline v3.9 for you?
On Wed, May 22, 2013 at 06:04:00PM +0200, Wolfram Sang wrote:
> On Wed, May 22, 2013 at 10:56:28AM -0500, Mark Brown wrote:
> > This doesn't apply against current code, can you please regenerate
> > against topic/fsl or mainline?
> ? Works fine against v3.10-rc2 here. Or is mainline v3.9 for you?
To be honest I didn't actually try mainline as I wasn't expecting any
conflicts from the branch and it didn't seem urgent as a bug fix.