From patchwork Fri Apr 29 11:34:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 8980121 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id D03D3BF29F for ; Fri, 29 Apr 2016 11:34:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CC1862015E for ; Fri, 29 Apr 2016 11:34:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDD782015A for ; Fri, 29 Apr 2016 11:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752563AbcD2Ler (ORCPT ); Fri, 29 Apr 2016 07:34:47 -0400 Received: from mezzanine.sirena.org.uk ([106.187.55.193]:59162 "EHLO mezzanine.sirena.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752176AbcD2Leq (ORCPT ); Fri, 29 Apr 2016 07:34:46 -0400 Received: from debutante.sirena.org.uk ([2a01:348:6:8808:fab::3] helo=debutante) by mezzanine.sirena.org.uk with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1aw6h0-0006DO-0t; Fri, 29 Apr 2016 11:34:42 +0000 Received: from broonie by debutante with local (Exim 4.87) (envelope-from ) id 1aw6gx-0004C3-5D; Fri, 29 Apr 2016 12:34:39 +0100 From: Mark Brown To: Axel Lin Cc: Mark Brown , Mark Brown , Purna Chandra Mandal , linux-spi@vger.kernel.org In-Reply-To: <1461745166.12751.0.camel@ingics.com> Message-Id: Date: Fri, 29 Apr 2016 12:34:39 +0100 X-SA-Exim-Connect-IP: 2a01:348:6:8808:fab::3 X-SA-Exim-Mail-From: broonie@sirena.org.uk X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Subject: Applied "spi: pic32: Fix checking return value of devm_ioremap_resource" to the spi tree X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on mezzanine.sirena.org.uk) Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The patch spi: pic32: Fix checking return value of devm_ioremap_resource has been applied to the spi tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark From 866e48b0994c6338e6aa4ae7c413b5888ab432d1 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Wed, 27 Apr 2016 16:19:26 +0800 Subject: [PATCH] spi: pic32: Fix checking return value of devm_ioremap_resource devm_ioremap_resource() returns ERR_PTR on error. Also remove the redundant dev_err message, the implementation of devm_ioremap_resource() already print error messages on error paths. Signed-off-by: Axel Lin Signed-off-by: Mark Brown --- drivers/spi/spi-pic32.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-pic32.c b/drivers/spi/spi-pic32.c index 4eeb8a85b030..73db87f805a1 100644 --- a/drivers/spi/spi-pic32.c +++ b/drivers/spi/spi-pic32.c @@ -711,10 +711,9 @@ static int pic32_spi_hw_probe(struct platform_device *pdev, mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); pic32s->regs = devm_ioremap_resource(&pdev->dev, mem); - if (!pic32s->regs) { - dev_err(&pdev->dev, "ioremap() failed\n"); - return -ENOMEM; - } + if (IS_ERR(pic32s->regs)) + return PTR_ERR(pic32s->regs); + pic32s->dma_base = mem->start; /* get irq resources: err-irq, rx-irq, tx-irq */