diff options
Diffstat (limited to 'drivers/media/rc/img-ir/img-ir-core.c')
| -rw-r--r-- | drivers/media/rc/img-ir/img-ir-core.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/media/rc/img-ir/img-ir-core.c b/drivers/media/rc/img-ir/img-ir-core.c index 094aa6a06315..067f4bc7fcc3 100644 --- a/drivers/media/rc/img-ir/img-ir-core.c +++ b/drivers/media/rc/img-ir/img-ir-core.c @@ -76,7 +76,6 @@ static void img_ir_ident(struct img_ir_priv *priv) static int img_ir_probe(struct platform_device *pdev) { struct img_ir_priv *priv; - struct resource *res_regs; int irq, error, error2; /* Get resources from platform device */ @@ -94,8 +93,7 @@ static int img_ir_probe(struct platform_device *pdev) spin_lock_init(&priv->lock); /* Ioremap the registers */ - res_regs = platform_get_resource(pdev, IORESOURCE_MEM, 0); - priv->reg_base = devm_ioremap_resource(&pdev->dev, res_regs); + priv->reg_base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(priv->reg_base)) return PTR_ERR(priv->reg_base); @@ -154,7 +152,7 @@ err_probe: return error; } -static int img_ir_remove(struct platform_device *pdev) +static void img_ir_remove(struct platform_device *pdev) { struct img_ir_priv *priv = platform_get_drvdata(pdev); @@ -166,7 +164,6 @@ static int img_ir_remove(struct platform_device *pdev) clk_disable_unprepare(priv->clk); if (!IS_ERR(priv->sys_clk)) clk_disable_unprepare(priv->sys_clk); - return 0; } static SIMPLE_DEV_PM_OPS(img_ir_pmops, img_ir_suspend, img_ir_resume); |