Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751535AbdHSNXC (ORCPT ); Sat, 19 Aug 2017 09:23:02 -0400 Received: from mail-wr0-f194.google.com ([209.85.128.194]:34060 "EHLO mail-wr0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751012AbdHSNXA (ORCPT ); Sat, 19 Aug 2017 09:23:00 -0400 From: Christian Lamparter To: Christophe JAILLET Cc: davem@davemloft.net, jarod@redhat.com, ivan@de.ibm.com, ebiggers@google.com, tklauser@distanz.ch, tremyfr@gmail.com, robh@kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] net: ibm: emac: Fix some error handling path in 'emac_probe()' Date: Sat, 19 Aug 2017 15:22:56 +0200 Message-ID: <2515086.XcP7alDqkk@debian64> User-Agent: KMail/5.2.3 (Linux/4.13.0-rc5-wt+; KDE/5.28.0; x86_64; ; ) In-Reply-To: <20170818230757.10934-1-christophe.jaillet@wanadoo.fr> References: <20170818230757.10934-1-christophe.jaillet@wanadoo.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1666 Lines: 46 On Saturday, August 19, 2017 1:07:57 AM CEST Christophe JAILLET wrote: > If 'irq_of_parse_and_map()' or 'of_address_to_resource()' fail, 'err' is > known to be 0 at this point. > So return -ENODEV instead in the first case and propagate the error > returned by 'of_address_to_resource()' in the 2nd case. > > While at it, turn a 'err != 0' test into an equivalent 'err' to be more > consistent. > > Signed-off-by: Christophe JAILLET > --- > drivers/net/ethernet/ibm/emac/core.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/ibm/emac/core.c b/drivers/net/ethernet/ibm/emac/core.c > index 95135d20458f..1af56a97fb47 100644 > --- a/drivers/net/ethernet/ibm/emac/core.c > +++ b/drivers/net/ethernet/ibm/emac/core.c > [...] > /* Map EMAC regs */ > - if (of_address_to_resource(np, 0, &dev->rsrc_regs)) { > + err = of_address_to_resource(np, 0, &dev->rsrc_regs); > + if (err) { > printk(KERN_ERR "%pOF: Can't get registers address\n", np); > goto err_irq_unmap; > } > // TODO : request_mem_region > dev->emacp = ioremap(dev->rsrc_regs.start, > resource_size(&dev->rsrc_regs)); > ... If you want to go for 101%: you could get rid of this block altogether by doing: dev->emacp = of_iomap(np, 0); Note1: This will also make the rsrc_regs variable in the emac_instance struct redundant. So simply remove it from the core.h. Note2: if you want to go for 110%, you could replace this with platform_get_resource() and devm_ioremap_resource() (if you are interested, take a look at devm_ioremap_resource's kdoc it has an example). Thanks, Christian