Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754089AbcKEHf6 (ORCPT ); Sat, 5 Nov 2016 03:35:58 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:35502 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753974AbcKEHfy (ORCPT ); Sat, 5 Nov 2016 03:35:54 -0400 Subject: Re: [PATCH] mtd: nand: denali_pci: add missing pci_release_regions() calls To: Masahiro Yamada , linux-mtd@lists.infradead.org References: <1478106790-10399-1-git-send-email-yamada.masahiro@socionext.com> Cc: Boris Brezillon , Brian Norris , Richard Weinberger , linux-kernel@vger.kernel.org, Bjorn Helgaas , Linas Vepstas , Andy Shevchenko , Enrico Jorns , David Woodhouse , Graham Moore From: Marek Vasut Message-ID: Date: Sat, 5 Nov 2016 08:28:48 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.4.0 MIME-Version: 1.0 In-Reply-To: <1478106790-10399-1-git-send-email-yamada.masahiro@socionext.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1964 Lines: 72 On 11/02/2016 06:13 PM, Masahiro Yamada wrote: > 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 Reviewed-by: Marek Vasut > --- > > 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 = { > -- Best regards, Marek Vasut