From: Dan Williams <dan.j.williams@intel.com> To: akpm@linux-foundation.org Cc: linux-nvdimm@lists.01.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ross Zwisler <ross.zwisler@linux.intel.com>, Christoph Hellwig <hch@lst.de> Subject: [PATCH 07/15] devm_memremap: convert to return ERR_PTR Date: Wed, 23 Sep 2015 00:41:50 -0400 [thread overview] Message-ID: <20150923044150.36490.15073.stgit@dwillia2-desk3.jf.intel.com> (raw) In-Reply-To: <20150923043737.36490.70547.stgit@dwillia2-desk3.jf.intel.com> 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> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/nvdimm/pmem.c | 16 ++++++---------- kernel/memremap.c | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 0680affae04a..9805d311b1d1 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -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; } diff --git a/kernel/memremap.c b/kernel/memremap.c index 0756273437e0..0d818ce04129 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -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) { -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Dan Williams <dan.j.williams@intel.com> To: akpm@linux-foundation.org Cc: linux-nvdimm@ml01.01.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, Ross Zwisler <ross.zwisler@linux.intel.com>, Christoph Hellwig <hch@lst.de> Subject: [PATCH 07/15] devm_memremap: convert to return ERR_PTR Date: Wed, 23 Sep 2015 00:41:50 -0400 [thread overview] Message-ID: <20150923044150.36490.15073.stgit@dwillia2-desk3.jf.intel.com> (raw) In-Reply-To: <20150923043737.36490.70547.stgit@dwillia2-desk3.jf.intel.com> 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> Signed-off-by: Dan Williams <dan.j.williams@intel.com> --- drivers/nvdimm/pmem.c | 16 ++++++---------- kernel/memremap.c | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c index 0680affae04a..9805d311b1d1 100644 --- a/drivers/nvdimm/pmem.c +++ b/drivers/nvdimm/pmem.c @@ -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; } diff --git a/kernel/memremap.c b/kernel/memremap.c index 0756273437e0..0d818ce04129 100644 --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -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) {
next prev parent reply other threads:[~2015-09-23 4:41 UTC|newest] Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-09-23 4:41 [PATCH 00/15] get_user_pages() for dax mappings Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-23 4:41 ` [PATCH 01/15] avr32: convert to asm-generic/memory_model.h Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-24 15:10 ` Christoph Hellwig 2015-09-24 15:10 ` Christoph Hellwig 2015-09-26 0:36 ` Dan Williams 2015-09-26 0:36 ` Dan Williams 2015-09-26 20:10 ` Christoph Hellwig 2015-09-26 20:10 ` Christoph Hellwig 2015-09-28 18:44 ` Luck, Tony 2015-09-28 18:44 ` Luck, Tony 2015-09-23 4:41 ` [PATCH 02/15] hugetlb: fix compile error on tile Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-23 4:41 ` [PATCH 03/15] frv: fix compiler warning from definition of __pmd() Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-23 4:41 ` [PATCH 04/15] x86, mm: quiet arch_add_memory() Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-24 15:10 ` Christoph Hellwig 2015-09-24 15:10 ` Christoph Hellwig 2015-09-23 4:41 ` [PATCH 05/15] pmem: kill memremap_pmem() Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-24 15:11 ` Christoph Hellwig 2015-09-24 15:11 ` Christoph Hellwig 2015-09-23 4:41 ` [PATCH 06/15] devm_memunmap: use devres_release() Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-24 15:13 ` Christoph Hellwig 2015-09-24 15:13 ` Christoph Hellwig 2015-09-23 4:41 ` Dan Williams [this message] 2015-09-23 4:41 ` [PATCH 07/15] devm_memremap: convert to return ERR_PTR Dan Williams 2015-09-24 15:13 ` Christoph Hellwig 2015-09-24 15:13 ` Christoph Hellwig 2015-09-23 4:41 ` [PATCH 08/15] block, dax, pmem: reference counting infrastructure Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-23 4:41 ` Dan Williams 2015-09-24 15:15 ` Christoph Hellwig 2015-09-24 15:15 ` Christoph Hellwig 2015-09-25 0:03 ` Dan Williams 2015-09-25 0:03 ` Dan Williams 2015-09-25 11:32 ` Christoph Hellwig 2015-09-25 11:32 ` Christoph Hellwig 2015-09-25 21:08 ` Williams, Dan J 2015-09-25 21:08 ` Williams, Dan J 2015-09-23 4:42 ` [PATCH 09/15] block, pmem: fix null pointer de-reference on shutdown, check for queue death Dan Williams 2015-09-23 4:42 ` Dan Williams 2015-09-23 4:42 ` [PATCH 10/15] block, dax: fix lifetime of in-kernel dax mappings Dan Williams 2015-09-23 4:42 ` Dan Williams 2015-10-07 22:56 ` Logan Gunthorpe 2015-10-07 22:56 ` Logan Gunthorpe 2015-10-09 21:12 ` Dan Williams 2015-10-09 21:12 ` Dan Williams 2015-09-23 4:42 ` [PATCH 11/15] mm, dax, pmem: introduce __pfn_t Dan Williams 2015-09-23 4:42 ` Dan Williams 2015-09-23 16:02 ` Dave Hansen 2015-09-23 16:02 ` Dave Hansen 2015-09-23 23:36 ` Williams, Dan J 2015-09-23 23:36 ` Williams, Dan J 2015-09-23 4:42 ` [PATCH 12/15] mm, dax, gpu: convert vm_insert_mixed to __pfn_t, introduce _PAGE_DEVMAP Dan Williams 2015-09-23 4:42 ` Dan Williams 2015-09-23 13:47 ` Geert Uytterhoeven 2015-09-23 13:47 ` Geert Uytterhoeven 2015-09-23 13:47 ` Geert Uytterhoeven 2015-09-23 16:59 ` Dan Williams 2015-09-23 16:59 ` Dan Williams 2015-09-23 4:42 ` [PATCH 13/15] mm, dax: convert vmf_insert_pfn_pmd() to __pfn_t Dan Williams 2015-09-23 4:42 ` Dan Williams 2015-09-23 4:42 ` [PATCH 14/15] mm, dax, pmem: introduce {get|put}_dev_pagemap() for dax-gup Dan Williams 2015-09-23 4:42 ` Dan Williams 2015-10-02 21:21 ` Logan Gunthorpe 2015-10-02 21:21 ` Logan Gunthorpe 2015-10-02 21:53 ` Dan Williams 2015-10-02 21:53 ` Dan Williams 2015-10-02 22:14 ` Logan Gunthorpe 2015-10-02 22:14 ` Logan Gunthorpe 2015-10-02 22:14 ` Logan Gunthorpe 2015-10-02 22:42 ` Logan Gunthorpe 2015-10-02 22:42 ` Logan Gunthorpe 2015-10-02 22:42 ` Logan Gunthorpe 2015-10-02 22:55 ` Dan Williams 2015-10-02 22:55 ` Dan Williams 2015-10-02 22:55 ` Dan Williams 2015-09-23 4:42 ` [PATCH 15/15] mm, x86: get_user_pages() for dax mappings Dan Williams 2015-09-23 4:42 ` Dan Williams
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20150923044150.36490.15073.stgit@dwillia2-desk3.jf.intel.com \ --to=dan.j.williams@intel.com \ --cc=akpm@linux-foundation.org \ --cc=hch@lst.de \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux-nvdimm@lists.01.org \ --cc=ross.zwisler@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.