lkml.org 
[lkml]   [2018]   [Jul]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v1 2/3] thermal: tsens: switch from of_iomap() to devm_ioremap_resource()
    Date
    devm_ioremap_resources() automatically requests resources (so that the I/O
    region shows up in /proc/iomem) and devm_ wrappers do better error handling
    and unmapping of the I/O region when needed.

    Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
    ---
    drivers/thermal/qcom/tsens-common.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    diff --git a/drivers/thermal/qcom/tsens-common.c b/drivers/thermal/qcom/tsens-common.c
    index 25e7f24..6207d8d 100644
    --- a/drivers/thermal/qcom/tsens-common.c
    +++ b/drivers/thermal/qcom/tsens-common.c
    @@ -127,13 +127,11 @@ static const struct regmap_config tsens_config = {
    int __init init_common(struct tsens_device *tmdev)
    {
    void __iomem *base;
    + struct resource *res;
    struct platform_device *op = of_find_device_by_node(tmdev->dev->of_node);

    if (!op)
    return -EINVAL;
    - base = of_iomap(tmdev->dev->of_node, 0);
    - if (!base)
    - return -EINVAL;

    /* The driver only uses the TM register address space for now */
    if (op->num_resources > 1) {
    @@ -143,11 +141,14 @@ int __init init_common(struct tsens_device *tmdev)
    tmdev->tm_offset = 0x1000;
    }

    + res = platform_get_resource(op, IORESOURCE_MEM, 0);
    + base = devm_ioremap_resource(&op->dev, res);
    + if (IS_ERR(base))
    + return PTR_ERR(base);
    +
    tmdev->map = devm_regmap_init_mmio(tmdev->dev, base, &tsens_config);
    - if (IS_ERR(tmdev->map)) {
    - iounmap(base);
    + if (IS_ERR(tmdev->map))
    return PTR_ERR(tmdev->map);
    - }

    return 0;
    }
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-07-18 09:26    [W:4.945 / U:3.816 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site