git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From c2367aa60d5e34d48582362c6de34b4131d92be7 Mon Sep 17 00:00:00 2001
   2 From: Yang Li <yang.lee@linux.alibaba.com>
   3 Date: Tue, 4 Apr 2023 18:21:40 +0100
   4 Subject: [PATCH] nvmem: vf610-ocotp: Use
   5  devm_platform_get_and_ioremap_resource()
   6
   7 According to commit 890cc39a8799 ("drivers: provide
   8 devm_platform_get_and_ioremap_resource()"), convert
   9 platform_get_resource(), devm_ioremap_resource() to a single
  10 call to devm_platform_get_and_ioremap_resource(), as this is exactly
  11 what this function does.
  12
  13 Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
  14 Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
  15 Link: https://lore.kernel.org/r/20230404172148.82422-33-srinivas.kandagatla@linaro.org
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17 ---
  18  drivers/nvmem/vf610-ocotp.c | 3 +--
  19  1 file changed, 1 insertion(+), 2 deletions(-)
  20
  21 --- a/drivers/nvmem/vf610-ocotp.c
  22 +++ b/drivers/nvmem/vf610-ocotp.c
  23 @@ -219,8 +219,7 @@ static int vf610_ocotp_probe(struct plat
  24         if (!ocotp_dev)
  25                 return -ENOMEM;
  26
  27 -       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  28 -       ocotp_dev->base = devm_ioremap_resource(dev, res);
  29 +       ocotp_dev->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
  30         if (IS_ERR(ocotp_dev->base))
  31                 return PTR_ERR(ocotp_dev->base);
  32