Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp1536942pxb; Thu, 4 Feb 2021 16:05:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJztu1OvrENr/KhuW+oYv/QDhMl1ZW2Thiol5iHpOoQIMpv51DxYgSZ3a4QlbMT/MAU17bKZ X-Received: by 2002:a17:906:7191:: with SMTP id h17mr1571963ejk.54.1612483520455; Thu, 04 Feb 2021 16:05:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1612483520; cv=none; d=google.com; s=arc-20160816; b=Wky0p+LB7owFlHKrqzz6WQjyUOwBrRApUpbfPB77Ji+VoHv1sVp9QShoFemp+06UbK CNGIOcJKaCnx2VeqSL7JdXhwESacICCFswRUWiUWmLv83e7HY+0oMukHj+kLfx6lO02C a5DHQTHA1p9A9tk2t3m09q4q53Oqa2oeyxXOt0sk10T8zYB9TtOe7wbtOg+eMIDyWqQV +nz9coDtW0PeUPJcTQyI4L6mM+0EUrg3H+ZJrFmxdxP1iwkfkorcQaJNMAKcHBJ1hbA8 g/I0oUJ5+OzqMY9ApfQwO0T274llogvnaTPaJAwgcR78PE6bVdDuRf/dGLeBwmBPFP6+ aS6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=tezzidt+nqW+Z37BW79X5IxfpZ+DT3pO3bmp/G7UV60=; b=V1zA5ld5tXS6mHFnUGg2iA6cjmjGkUYL2J5m3hYc1APFcQowhmRsVXghkYiWzzX/ch QUnRRwzPlYv5wg8vaa/ARkYFb50qMGf0Y2Ur1orpK+caJ0BP6BmGoqhroHhgrATylKC1 38Vrswn2y3OFmweWAyLK9AV48Gg/D+3nbcdaHhIy3GJL+tiB2U3pF+qkZ0Xp96JpeXth gRm1ffRWXNZ8dpvSTtWRAmiqTjlvdfnu9tvS/Ud66RLN0CxXFgTauuotia49YP2RbV3m EyP8yYUMzNq6gI5M6RriQUYU8XkNwDsSK1E1Bnd7NVc3YgHCIwNetH8xl+qSZouOtDse Urjw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z11si4185721ejj.440.2021.02.04.16.04.55; Thu, 04 Feb 2021 16:05:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235817AbhBDMPG (ORCPT + 99 others); Thu, 4 Feb 2021 07:15:06 -0500 Received: from hostingweb31-40.netsons.net ([89.40.174.40]:38210 "EHLO hostingweb31-40.netsons.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235721AbhBDMPE (ORCPT ); Thu, 4 Feb 2021 07:15:04 -0500 Received: from [77.244.183.192] (port=62020 helo=melee.fritz.box) by hostingweb31.netsons.net with esmtpa (Exim 4.93) (envelope-from ) id 1l7dWe-002S1d-Qu; Thu, 04 Feb 2021 13:14:20 +0100 From: Luca Ceresoli To: linux-fpga@vger.kernel.org Cc: Moritz Fischer , Tom Rix , Michal Simek , Alan Tull , Anatolij Gustschin , linux-kernel@vger.kernel.org, Luca Ceresoli Subject: [PATCH] fpga: fpga-mgr: xilinx-spi: fix error messages on -EPROBE_DEFER Date: Thu, 4 Feb 2021 13:13:13 +0100 Message-Id: <20210204121313.24655-1-luca@lucaceresoli.net> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - hostingweb31.netsons.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - lucaceresoli.net X-Get-Message-Sender-Via: hostingweb31.netsons.net: authenticated_id: luca+lucaceresoli.net/only user confirmed/virtual account not confirmed X-Authenticated-Sender: hostingweb31.netsons.net: luca@lucaceresoli.net X-Source: X-Source-Args: X-Source-Dir: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current code produces an error message on devm_gpiod_get() errors even when the error is -EPROBE_DEFER, which should be silent. This has been observed producing a significant amount of messages like: xlnx-slave-spi spi1.1: Failed to get PROGRAM_B gpio: -517 Fix and simplify code by using the dev_err_probe() helper function. Signed-off-by: Luca Ceresoli Fixes: dd2784c01d93 ("fpga manager: xilinx-spi: check INIT_B pin during write_init") Fixes: 061c97d13f1a ("fpga manager: Add Xilinx slave serial SPI driver") --- drivers/fpga/xilinx-spi.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx-spi.c index 27defa98092d..fee4d0abf6bf 100644 --- a/drivers/fpga/xilinx-spi.c +++ b/drivers/fpga/xilinx-spi.c @@ -233,25 +233,19 @@ static int xilinx_spi_probe(struct spi_device *spi) /* PROGRAM_B is active low */ conf->prog_b = devm_gpiod_get(&spi->dev, "prog_b", GPIOD_OUT_LOW); - if (IS_ERR(conf->prog_b)) { - dev_err(&spi->dev, "Failed to get PROGRAM_B gpio: %ld\n", - PTR_ERR(conf->prog_b)); - return PTR_ERR(conf->prog_b); - } + if (IS_ERR(conf->prog_b)) + return dev_err_probe(&spi->dev, PTR_ERR(conf->prog_b), + "Failed to get PROGRAM_B gpio\n"); conf->init_b = devm_gpiod_get_optional(&spi->dev, "init-b", GPIOD_IN); - if (IS_ERR(conf->init_b)) { - dev_err(&spi->dev, "Failed to get INIT_B gpio: %ld\n", - PTR_ERR(conf->init_b)); - return PTR_ERR(conf->init_b); - } + if (IS_ERR(conf->init_b)) + return dev_err_probe(&spi->dev, PTR_ERR(conf->init_b), + "Failed to get INIT_B gpio\n"); conf->done = devm_gpiod_get(&spi->dev, "done", GPIOD_IN); - if (IS_ERR(conf->done)) { - dev_err(&spi->dev, "Failed to get DONE gpio: %ld\n", - PTR_ERR(conf->done)); - return PTR_ERR(conf->done); - } + if (IS_ERR(conf->done)) + return dev_err_probe(&spi->dev, PTR_ERR(conf->done), + "Failed to get DONE gpio\n"); mgr = devm_fpga_mgr_create(&spi->dev, "Xilinx Slave Serial FPGA Manager", -- 2.30.0