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

Commit b36f4761 authored by Dan Williams's avatar Dan Williams
Browse files

devm_memremap: convert to return ERR_PTR 



Make devm_memremap consistent with the error return scheme of
devm_memremap_pages to remove special casing in the pmem driver.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Ross Zwisler <ross.zwisler@linux.intel.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d741314f

drivers/nvdimm/pmem.c

+6 −10
Original line number Diff line number Diff line
@@ -150,19 +150,15 @@ static struct pmem_device *pmem_alloc(struct device *dev, 
		return ERR_PTR(-EBUSY);

	}



	if (pmem_should_map_pages(dev)) {

		void *addr = devm_memremap_pages(dev, res);



		if (IS_ERR(addr))

			return addr;

		pmem->virt_addr = (void __pmem *) addr;

	} else {

	if (pmem_should_map_pages(dev))

		pmem->virt_addr = (void __pmem *) devm_memremap_pages(dev, res);

	else

		pmem->virt_addr = (void __pmem *) devm_memremap(dev,

				pmem->phys_addr, pmem->size,

				ARCH_MEMREMAP_PMEM);

		if (!pmem->virt_addr)

			return ERR_PTR(-ENXIO);

	}



	if (IS_ERR(pmem->virt_addr))

		return (void __force *) pmem->virt_addr;



	return pmem;

}

kernel/memremap.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ void *devm_memremap(struct device *dev, resource_size_t offset, 


	ptr = devres_alloc(devm_memremap_release, sizeof(*ptr), GFP_KERNEL);

	if (!ptr)

		return NULL;

		return ERR_PTR(-ENOMEM);



	addr = memremap(offset, size, flags);

	if (addr) {