Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 432429d1 authored by Yangtao Li's avatar Yangtao Li Committed by Greg Kroah-Hartman
Browse files

virtio-mmio: convert to devm_platform_ioremap_resource 



[ Upstream commit c64eb62cfce242a57a7276ca8280ae0baab29d05 ]

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

Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Stable-dep-of: 55c91fedd03d ("virtio-mmio: don't break lifecycle of vm_dev")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 12c4c227

drivers/virtio/virtio_mmio.c

+3 −12
Original line number Diff line number Diff line
@@ -554,18 +554,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;
@@ -577,9 +568,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);