Skip to contentSkip to conversation

virtio-mmio: convert to devm_platform_ioremap_resource

PATCH In review Yangtao Li 2 participants 3 messages Dec 22, 2019 – Dec 23, 2019 virtio core

lore
Share & tools
lore

Yangtao Li

author
#0 lore raw

PATCH 1/1 virtio-mmio: convert to devm_platform_ioremap_resource

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

---
 drivers/virtio/virtio_mmio.c | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/virtio/virtio_mmio.c +3 -12
index e09edb5c5e06..97d5725fd9a2 100644
@@ -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);
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#1 lore raw
Quoted 35 lines · Yangtao Li

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

---
  drivers/virtio/virtio_mmio.c | 15 +++------------
  1 file changed, 3 insertions(+), 12 deletions(-)
drivers/virtio/virtio_mmio.c +0 -9
index e09edb5c5e06..97d5725fd9a2 100644
@@ -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);

drivers/virtio/virtio_mmio.c static int virtio_mmio_probe(struct platform_device *pdev) · line 553

Quoted 10 lines
drivers/virtio/virtio_mmio.c +3 -3
 
-	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);

_______________________________________________
Virtualization mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/virtualization

Acked-by on v1 1/1
#2 lore raw
In reply to Yangtao Li
Quoted 35 lines · Yangtao Li

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

---
  drivers/virtio/virtio_mmio.c | 15 +++------------
  1 file changed, 3 insertions(+), 12 deletions(-)
drivers/virtio/virtio_mmio.c +0 -9
index e09edb5c5e06..97d5725fd9a2 100644
@@ -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);

drivers/virtio/virtio_mmio.c static int virtio_mmio_probe(struct platform_device *pdev) · line 553

Quoted 10 lines
drivers/virtio/virtio_mmio.c +3 -3
 
-	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);