virtualization.lists.linux-foundation.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] virtio-mmio: convert to devm_platform_ioremap_resource
@ 2019-12-22 19:08 Yangtao Li
  2019-12-23  8:43 ` Jason Wang
  0 siblings, 1 reply; 4+ messages in thread
From: Yangtao Li @ 2019-12-22 19:08 UTC (permalink / raw)
  To: mst, jasowang; +Cc: Yangtao Li, linux-kernel, virtualization

Use devm_platform_ioremap_resource() to simplify code, which
contains platform_get_resource, devm_request_mem_region and
devm_ioremap.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 drivers/virtio/virtio_mmio.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index e09edb5c5e06..97d5725fd9a2 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -531,18 +531,9 @@ static void virtio_mmio_release_dev(struct device *_d)
 static int virtio_mmio_probe(struct platform_device *pdev)
 {
 	struct virtio_mmio_device *vm_dev;
-	struct resource *mem;
 	unsigned long magic;
 	int rc;
 
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!mem)
-		return -EINVAL;
-
-	if (!devm_request_mem_region(&pdev->dev, mem->start,
-			resource_size(mem), pdev->name))
-		return -EBUSY;
-
 	vm_dev = devm_kzalloc(&pdev->dev, sizeof(*vm_dev), GFP_KERNEL);
 	if (!vm_dev)
 		return -ENOMEM;
@@ -554,9 +545,9 @@ static int virtio_mmio_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&vm_dev->virtqueues);
 	spin_lock_init(&vm_dev->lock);
 
-	vm_dev->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
-	if (vm_dev->base == NULL)
-		return -EFAULT;
+	vm_dev->base = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(vm_dev->base))
+		return PTR_ERR(vm_dev->base);
 
 	/* Check magic value */
 	magic = readl(vm_dev->base + VIRTIO_MMIO_MAGIC_VALUE);
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] virtio-mmio: convert to devm_platform_ioremap_resource
  2019-12-22 19:08 [PATCH] virtio-mmio: convert to devm_platform_ioremap_resource Yangtao Li
@ 2019-12-23  8:43 ` Jason Wang
  0 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2019-12-23  8:43 UTC (permalink / raw)
  To: Yangtao Li, mst; +Cc: linux-kernel, virtualization


On 2019/12/23 上午3:08, Yangtao Li wrote:
> Use devm_platform_ioremap_resource() to simplify code, which
> contains platform_get_resource, devm_request_mem_region and
> devm_ioremap.
>
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> ---
>   drivers/virtio/virtio_mmio.c | 15 +++------------
>   1 file changed, 3 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
> index e09edb5c5e06..97d5725fd9a2 100644
> --- a/drivers/virtio/virtio_mmio.c
> +++ b/drivers/virtio/virtio_mmio.c
> @@ -531,18 +531,9 @@ static void virtio_mmio_release_dev(struct device *_d)
>   static int virtio_mmio_probe(struct platform_device *pdev)
>   {
>   	struct virtio_mmio_device *vm_dev;
> -	struct resource *mem;
>   	unsigned long magic;
>   	int rc;
>   
> -	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> -	if (!mem)
> -		return -EINVAL;
> -
> -	if (!devm_request_mem_region(&pdev->dev, mem->start,
> -			resource_size(mem), pdev->name))
> -		return -EBUSY;
> -
>   	vm_dev = devm_kzalloc(&pdev->dev, sizeof(*vm_dev), GFP_KERNEL);
>   	if (!vm_dev)
>   		return -ENOMEM;
> @@ -554,9 +545,9 @@ static int virtio_mmio_probe(struct platform_device *pdev)
>   	INIT_LIST_HEAD(&vm_dev->virtqueues);
>   	spin_lock_init(&vm_dev->lock);
>   
> -	vm_dev->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
> -	if (vm_dev->base == NULL)
> -		return -EFAULT;
> +	vm_dev->base = devm_platform_ioremap_resource(pdev, 0);
> +	if (IS_ERR(vm_dev->base))
> +		return PTR_ERR(vm_dev->base);
>   
>   	/* Check magic value */
>   	magic = readl(vm_dev->base + VIRTIO_MMIO_MAGIC_VALUE);


Acked-by: Jason Wang <jasowang@redhat.com>


_______________________________________________
Virtualization mailing list
Virtualization@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

^ permalink raw reply	[flat|nested] 4+ messages in thread

* [PATCH] virtio-mmio: convert to devm_platform_ioremap_resource
       [not found] <20191223185918.9877-1-tiny.windzz@gmail.com>
@ 2019-12-23 18:59 ` Yangtao Li
       [not found] ` <20191223185918.9877-2-tiny.windzz@gmail.com>
  1 sibling, 0 replies; 4+ messages in thread
From: Yangtao Li @ 2019-12-23 18:59 UTC (permalink / raw)
  To: m.szyprowski, joro, kgene, krzk, matthias.bgg, agross,
	bjorn.andersson, robdclark, heiko, mst, jasowang, iommu,
	linux-arm-kernel, linux-samsung-soc, linux-kernel, linux-mediatek,
	linux-arm-msm, linux-rockchip, virtualization
  Cc: Yangtao Li

Use devm_platform_ioremap_resource() to simplify code, which
contains platform_get_resource, devm_request_mem_region and
devm_ioremap.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 drivers/virtio/virtio_mmio.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c
index e09edb5c5e06..97d5725fd9a2 100644
--- a/drivers/virtio/virtio_mmio.c
+++ b/drivers/virtio/virtio_mmio.c
@@ -531,18 +531,9 @@ static void virtio_mmio_release_dev(struct device *_d)
 static int virtio_mmio_probe(struct platform_device *pdev)
 {
 	struct virtio_mmio_device *vm_dev;
-	struct resource *mem;
 	unsigned long magic;
 	int rc;
 
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!mem)
-		return -EINVAL;
-
-	if (!devm_request_mem_region(&pdev->dev, mem->start,
-			resource_size(mem), pdev->name))
-		return -EBUSY;
-
 	vm_dev = devm_kzalloc(&pdev->dev, sizeof(*vm_dev), GFP_KERNEL);
 	if (!vm_dev)
 		return -ENOMEM;
@@ -554,9 +545,9 @@ static int virtio_mmio_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&vm_dev->virtqueues);
 	spin_lock_init(&vm_dev->lock);
 
-	vm_dev->base = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
-	if (vm_dev->base == NULL)
-		return -EFAULT;
+	vm_dev->base = devm_platform_ioremap_resource(pdev, 0);
+	if (IS_ERR(vm_dev->base))
+		return PTR_ERR(vm_dev->base);
 
 	/* Check magic value */
 	magic = readl(vm_dev->base + VIRTIO_MMIO_MAGIC_VALUE);
-- 
2.17.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] virtio-mmio: convert to devm_platform_ioremap_resource
       [not found] ` <20191223185918.9877-2-tiny.windzz@gmail.com>
@ 2019-12-23 19:00   ` Frank Lee
  0 siblings, 0 replies; 4+ messages in thread
From: Frank Lee @ 2019-12-23 19:00 UTC (permalink / raw)
  To: m.szyprowski, joro, Kukjin Kim, Krzysztof Kozlowski,
	Matthias Brugger, agross, bjorn.andersson, Rob Clark,
	Heiko Stübner, mst, jasowang, iommu, Linux ARM,
	linux-samsung-soc, Linux Kernel Mailing List, linux-mediatek,
	linux-arm-msm, open list:ARM/Rockchip SoC..., virtualization

Please ignore this patch.

Thx!

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-12-23 19:00 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-22 19:08 [PATCH] virtio-mmio: convert to devm_platform_ioremap_resource Yangtao Li
2019-12-23  8:43 ` Jason Wang
     [not found] <20191223185918.9877-1-tiny.windzz@gmail.com>
2019-12-23 18:59 ` Yangtao Li
     [not found] ` <20191223185918.9877-2-tiny.windzz@gmail.com>
2019-12-23 19:00   ` Frank Lee

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).