From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 4293EC2BD09 for ; Wed, 4 Dec 2019 18:03:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0CDEE20881 for ; Wed, 4 Dec 2019 18:03:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482624; bh=i4Xx5F79MHChszdl6RDWs7gnrpV4iNMdBKz68TMk6oA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fI27o9X0v2OZ56AcsqF78T3DlkiSPJxcUyBPAFHacKZNMBH2tIcQIa3FGSEM7l61L S6+bfulgvjxTFKKYH+FOxEcT9NYo5OnKNYmQcbPL/Pf0swJw5PiR3sISuZt4IZ2SGd n7utVZet0WT7SS6Woxd7JYNGXebiXNn0QRreyRcY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730094AbfLDSDm (ORCPT ); Wed, 4 Dec 2019 13:03:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:47766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729632AbfLDSDh (ORCPT ); Wed, 4 Dec 2019 13:03:37 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5ABB32081B; Wed, 4 Dec 2019 18:03:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482616; bh=i4Xx5F79MHChszdl6RDWs7gnrpV4iNMdBKz68TMk6oA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z89M8vWhYpA8zLPS5mTVJaQMzmauQEt5amtC/IEtF0grfip3H19xXHiyi8ygDBJfF m5QjGRNp0m6nRUhIYquqCbpbG07L1jWWqNZ1OMkNUNDT2og0p2zi2eUku9g1rW6R6K KRLb6uDFGdM5+BbGHVczK0BWcYSZ4GgPqpUptHgQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Saeed Mahameed , Leon Romanovsky , Sasha Levin Subject: [PATCH 4.14 067/209] net/mlx5: Continue driver initialization despite debugfs failure Date: Wed, 4 Dec 2019 18:54:39 +0100 Message-Id: <20191204175325.897021759@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leon Romanovsky [ Upstream commit 199fa087dc6b503baad06712716fac645a983e8a ] The failure to create debugfs entry is unpleasant event, but not enough to abort drier initialization. Align the mlx5_core code to debugfs design and continue execution whenever debugfs_create_dir() successes or not. Fixes: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters") Reviewed-by: Saeed Mahameed Signed-off-by: Leon Romanovsky Signed-off-by: Saeed Mahameed Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 97874c2568fc9..1ac0e173da12c 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -838,11 +838,9 @@ static int mlx5_pci_init(struct mlx5_core_dev *dev, struct mlx5_priv *priv) priv->numa_node = dev_to_node(&dev->pdev->dev); - priv->dbg_root = debugfs_create_dir(dev_name(&pdev->dev), mlx5_debugfs_root); - if (!priv->dbg_root) { - dev_err(&pdev->dev, "Cannot create debugfs dir, aborting\n"); - return -ENOMEM; - } + if (mlx5_debugfs_root) + priv->dbg_root = + debugfs_create_dir(pci_name(pdev), mlx5_debugfs_root); err = mlx5_pci_enable_device(dev); if (err) { -- 2.20.1