cc7ab6a6b1
* Attach Meson64 to mainline with a bunch of patches. Tested, but need further work. * Enable DVFS on N2 which sometimes works, sometime doesn't, cleanup * Enable beta targets for Meson64 kernel family * Bump with version
54 lines
1.9 KiB
Diff
54 lines
1.9 KiB
Diff
Use devm_platform_ioremap_resource() to simplify code.
|
|
|
|
Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
|
|
---
|
|
drivers/soc/amlogic/meson-canvas.c | 4 +---
|
|
drivers/soc/amlogic/meson-clk-measure.c | 4 +---
|
|
2 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/drivers/soc/amlogic/meson-canvas.c b/drivers/soc/amlogic/meson-canvas.c
|
|
index c655f5f92b12..561044063319 100644
|
|
--- a/drivers/soc/amlogic/meson-canvas.c
|
|
+++ b/drivers/soc/amlogic/meson-canvas.c
|
|
@@ -166,7 +166,6 @@ EXPORT_SYMBOL_GPL(meson_canvas_free);
|
|
|
|
static int meson_canvas_probe(struct platform_device *pdev)
|
|
{
|
|
- struct resource *res;
|
|
struct meson_canvas *canvas;
|
|
struct device *dev = &pdev->dev;
|
|
|
|
@@ -174,8 +173,7 @@ static int meson_canvas_probe(struct platform_device *pdev)
|
|
if (!canvas)
|
|
return -ENOMEM;
|
|
|
|
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
- canvas->reg_base = devm_ioremap_resource(dev, res);
|
|
+ canvas->reg_base = devm_platform_ioremap_resource(pdev, 0);
|
|
if (IS_ERR(canvas->reg_base))
|
|
return PTR_ERR(canvas->reg_base);
|
|
|
|
diff --git a/drivers/soc/amlogic/meson-clk-measure.c b/drivers/soc/amlogic/meson-clk-measure.c
|
|
index 0fa47d77577d..173baa53fce3 100644
|
|
--- a/drivers/soc/amlogic/meson-clk-measure.c
|
|
+++ b/drivers/soc/amlogic/meson-clk-measure.c
|
|
@@ -605,7 +605,6 @@ static int meson_msr_probe(struct platform_device *pdev)
|
|
{
|
|
const struct meson_msr_id *match_data;
|
|
struct meson_msr *priv;
|
|
- struct resource *res;
|
|
struct dentry *root, *clks;
|
|
void __iomem *base;
|
|
int i;
|
|
@@ -623,8 +622,7 @@ static int meson_msr_probe(struct platform_device *pdev)
|
|
|
|
memcpy(priv->msr_table, match_data, sizeof(priv->msr_table));
|
|
|
|
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
- base = devm_ioremap_resource(&pdev->dev, res);
|
|
+ base = devm_platform_ioremap_resource(pdev, 0);
|
|
if (IS_ERR(base)) {
|
|
dev_err(&pdev->dev, "io resource mapping failed\n");
|
|
return PTR_ERR(base);
|
|
|