From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752783AbaFDLlC (ORCPT ); Wed, 4 Jun 2014 07:41:02 -0400 Received: from mail.dev.rtsoft.ru ([213.79.90.226]:58901 "EHLO dev.rtsoft.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752309AbaFDLgG (ORCPT ); Wed, 4 Jun 2014 07:36:06 -0400 From: nyushchenko@dev.rtsoft.ru To: Grant Likely , Rob Herring , Benjamin Herrenschmidt , Thomas Gleixner , devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, lugovskoy@dev.rtsoft.ru, Nikita Yushchenko Subject: [PATCH 12/21] mpc5121_nfc: use devm_irq_of_parse_and_map() Date: Wed, 4 Jun 2014 15:13:12 +0400 Message-Id: <1401880402-30091-13-git-send-email-nyushchenko@dev.rtsoft.ru> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1401880402-30091-1-git-send-email-nyushchenko@dev.rtsoft.ru> References: <1401880402-30091-1-git-send-email-nyushchenko@dev.rtsoft.ru> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Nikita Yushchenko This avoids leak of IRQ mapping on error paths, and makes it possible to use devm_request_irq() without facing unmap-while-handler-installed issues. Signed-off-by: Nikita Yushchenko --- drivers/mtd/nand/mpc5121_nfc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mtd/nand/mpc5121_nfc.c b/drivers/mtd/nand/mpc5121_nfc.c index e78841a..b710168 100644 --- a/drivers/mtd/nand/mpc5121_nfc.c +++ b/drivers/mtd/nand/mpc5121_nfc.c @@ -669,10 +669,10 @@ static int mpc5121_nfc_probe(struct platform_device *op) return retval; } - prv->irq = irq_of_parse_and_map(dn, 0); - if (prv->irq == NO_IRQ) { + prv->irq = devm_irq_of_parse_and_map(dev, dn, 0); + if (prv->irq <= 0) { dev_err(dev, "Error mapping IRQ!\n"); - return -EINVAL; + return prv->irq ? prv->irq : -EINVAL; } retval = of_address_to_resource(dn, 0, &res); -- 1.7.10.4