Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 614AEC11F67 for ; Tue, 29 Jun 2021 17:09:36 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F70661DD2 for ; Tue, 29 Jun 2021 17:09:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6F70661DD2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 337E0831BC; Tue, 29 Jun 2021 19:09:23 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RZ8mbsJR"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F39DD831BC; Tue, 29 Jun 2021 19:09:15 +0200 (CEST) Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CDF6E831A5 for ; Tue, 29 Jun 2021 19:09:11 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=olteanv@gmail.com Received: by mail-ej1-x632.google.com with SMTP id b2so6254285ejg.8 for ; Tue, 29 Jun 2021 10:09:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zUMF2wRY1JubFwwPjdQKxs9PC08pqSW8clc5B8LLURA=; b=RZ8mbsJRBMnIPeQFJ9BqAytd9fhAFJ28oT6/mRCxnxl40E+t9eu1UCad940CTD43U/ h2793o8Goz2YgYSfWjIkHAKfHUlo6Ljo8Vd0bzjYqwmilasqEOotn4g2+lGogxOdYRI8 HGrT4Ne6GQQv7IeLgiRCC63zkdnJ+pN2tOqjQlNtpuUcMp9+ki8nW86QuCWU7LWj8BY2 XByvhehcy+1SHQClHdYJVwhnJ8/TLfVFerDVKsh2Hm+PNGo/YnqHEmpE0chsX3jb6P85 Kpk9djrm30zeXZNVWM6AwlTILz+PrE5Hc04bxkl3vcp99jyMijcG5mRueFW1YVnsb9yT rBMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zUMF2wRY1JubFwwPjdQKxs9PC08pqSW8clc5B8LLURA=; b=jr3O7YRJoiNtHRfbjrkU5Fb8FXDXgkkoCjf506duWTkkIGmDAutEWrL+ngWk509pht 53zl+ytqL+K6G1SsCS2HelanTo8g04S7SKEdEkHqlHi+Q9c0C/WOcM9FKfIOd/l5jaQB sn2o2d6cIHdtaVq+6Lv22D3Bgt+F6uaWsk7TcAmJ2Pwrs4qSWqDeH9EBUxAUB218CpiZ zGIUpV0neaLXF7QOq3GWnwX4f8soH4CEHFsIDlqqpeBJZBO/Eao1IrkpBFv+SrNhhC6U VjGp5Na/dDvWdRgMiUUSQphVrbtVpLyA8RCcBN5zWmMzlqkwCBD8iTDHDnoVEW6cMsmd 6Rog== X-Gm-Message-State: AOAM532BMBiRBSLRonTZRPUDpiHv6C9K868vx7c/qNxrc3jk7cGPLzVn AlG3osYYwiw9I7N9YtuVSa8= X-Google-Smtp-Source: ABdhPJxhDvJCntaW10gG1NlaosbvqbdmYiw75v0wRyD/eTWS1fnrrZSeydcIURBoYjuGDc+soklElA== X-Received: by 2002:a17:907:1609:: with SMTP id hb9mr30217194ejc.368.1624986551553; Tue, 29 Jun 2021 10:09:11 -0700 (PDT) Received: from localhost.localdomain ([188.26.224.68]) by smtp.gmail.com with ESMTPSA id h19sm9928525edt.87.2021.06.29.10.09.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Jun 2021 10:09:11 -0700 (PDT) From: Vladimir Oltean To: Joe Hershberger , Ramon Fried , u-boot@lists.denx.de Cc: Claudiu Manoil , Bin Meng , Alex Marginean , Michael Walle , Tim Harvey , Vladimir Oltean Subject: [PATCH 2/6] net: dsa: use "err" instead of "ret" in dsa_port_probe Date: Tue, 29 Jun 2021 20:08:35 +0300 Message-Id: <20210629170839.2583797-3-olteanv@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210629170839.2583797-1-olteanv@gmail.com> References: <20210629170839.2583797-1-olteanv@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Vladimir Oltean DM DSA uses "err" for error code values, so use this consistently. Signed-off-by: Vladimir Oltean --- net/dsa-uclass.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/dsa-uclass.c b/net/dsa-uclass.c index 7ea1cb6949c0..17b33834f585 100644 --- a/net/dsa-uclass.c +++ b/net/dsa-uclass.c @@ -248,7 +248,7 @@ static int dsa_port_probe(struct udevice *pdev) struct dsa_port_pdata *port_pdata; struct dsa_priv *dsa_priv; struct udevice *master; - int ret; + int err; port_pdata = dev_get_parent_plat(pdev); dsa_priv = dev_get_uclass_priv(dev); @@ -268,9 +268,9 @@ static int dsa_port_probe(struct udevice *pdev) * TODO: we assume the master device is always there and doesn't get * removed during runtime. */ - ret = device_probe(master); - if (ret) - return ret; + err = device_probe(master); + if (err) + return err; /* * Inherit port's hwaddr from the DSA master, unless the port already -- 2.25.1