Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756476AbcKBRQw (ORCPT ); Wed, 2 Nov 2016 13:16:52 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:63583 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933281AbcKBRQt (ORCPT ); Wed, 2 Nov 2016 13:16:49 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com uA2HDqeL005857 X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: linux-mtd@lists.infradead.org Cc: Enrico Jorns , Andy Shevchenko , Bjorn Helgaas , Linas Vepstas , Boris Brezillon , Brian Norris , Graham Moore , Masahiro Yamada , linux-kernel@vger.kernel.org, Richard Weinberger , David Woodhouse Subject: [PATCH] mtd: nand: denali_pci: add missing pci_release_regions() calls Date: Thu, 3 Nov 2016 02:13:10 +0900 Message-Id: <1478106790-10399-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1717 Lines: 64 The probe function calls pci_request_regions(), but I do not see corresponding pci_release_regions() calls. While we are here, rename the jump labels to follow the guideline "Choose label names which say what the goto does" suggested by Documentation/CodingStyle. Signed-off-by: Masahiro Yamada --- drivers/mtd/nand/denali_pci.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/mtd/nand/denali_pci.c b/drivers/mtd/nand/denali_pci.c index de31514..be8152f 100644 --- a/drivers/mtd/nand/denali_pci.c +++ b/drivers/mtd/nand/denali_pci.c @@ -76,28 +76,31 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) denali->flash_reg = ioremap_nocache(csr_base, csr_len); if (!denali->flash_reg) { dev_err(&dev->dev, "Spectra: Unable to remap memory region\n"); - return -ENOMEM; + ret = -ENOMEM; + goto release_regions; } denali->flash_mem = ioremap_nocache(mem_base, mem_len); if (!denali->flash_mem) { dev_err(&dev->dev, "Spectra: ioremap_nocache failed!"); ret = -ENOMEM; - goto failed_remap_reg; + goto unmap_reg; } ret = denali_init(denali); if (ret) - goto failed_remap_mem; + goto unmap_mem; pci_set_drvdata(dev, denali); return 0; -failed_remap_mem: +unmap_mem: iounmap(denali->flash_mem); -failed_remap_reg: +unmap_reg: iounmap(denali->flash_reg); +release_regions: + pci_release_regions(dev); return ret; } @@ -109,6 +112,7 @@ static void denali_pci_remove(struct pci_dev *dev) denali_remove(denali); iounmap(denali->flash_reg); iounmap(denali->flash_mem); + pci_release_regions(dev); } static struct pci_driver denali_pci_driver = { -- 1.9.1