lkml.org 
[lkml]   [2019]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 5/8] misc: sram: use devm_platform_ioremap_resource_wc()
    Date
    From: Bartosz Golaszewski <bgolaszewski@baylibre.com>

    Use the new devm_platform_ioremap_resource_wc() helper instead of
    devm_ioremap_wc() combinded with a call to platform_get_resource().
    Also use devm_platform_ioremap_resource() where applicable.

    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    ---
    drivers/misc/sram.c | 28 ++++++++--------------------
    1 file changed, 8 insertions(+), 20 deletions(-)

    diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c
    index f30448bf3a63..6c1a23cb3e8c 100644
    --- a/drivers/misc/sram.c
    +++ b/drivers/misc/sram.c
    @@ -340,8 +340,6 @@ static const struct of_device_id sram_dt_ids[] = {
    static int sram_probe(struct platform_device *pdev)
    {
    struct sram_dev *sram;
    - struct resource *res;
    - size_t size;
    int ret;
    int (*init_func)(void);

    @@ -351,25 +349,14 @@ static int sram_probe(struct platform_device *pdev)

    sram->dev = &pdev->dev;

    - res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    - if (!res) {
    - dev_err(sram->dev, "found no memory resource\n");
    - return -EINVAL;
    - }
    -
    - size = resource_size(res);
    -
    - if (!devm_request_mem_region(sram->dev, res->start, size, pdev->name)) {
    - dev_err(sram->dev, "could not request region for resource\n");
    - return -EBUSY;
    - }
    -
    if (of_property_read_bool(pdev->dev.of_node, "no-memory-wc"))
    - sram->virt_base = devm_ioremap(sram->dev, res->start, size);
    + sram->virt_base = devm_platform_ioremap_resource(pdev, 0);
    else
    - sram->virt_base = devm_ioremap_wc(sram->dev, res->start, size);
    - if (!sram->virt_base)
    - return -ENOMEM;
    + sram->virt_base = devm_platform_ioremap_resource_wc(pdev, 0);
    + if (IS_ERR(sram->virt_base)) {
    + dev_err(&pdev->dev, "could not map SRAM registers\n");
    + return PTR_ERR(sram->virt_base);
    + }

    sram->pool = devm_gen_pool_create(sram->dev, ilog2(SRAM_GRANULARITY),
    NUMA_NO_NODE, NULL);
    @@ -382,7 +369,8 @@ static int sram_probe(struct platform_device *pdev)
    else
    clk_prepare_enable(sram->clk);

    - ret = sram_reserve_regions(sram, res);
    + ret = sram_reserve_regions(sram,
    + platform_get_resource(pdev, IORESOURCE_MEM, 0));
    if (ret)
    goto err_disable_clk;

    --
    2.23.0
    \
     
     \ /
      Last update: 2019-10-06 07:40    [W:2.493 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site