From patchwork Sat Mar 6 22:12:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grant Grundler X-Patchwork-Id: 394838 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=-18.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 E5A55C433E0 for ; Sat, 6 Mar 2021 22:13:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A72FC650D0 for ; Sat, 6 Mar 2021 22:13:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229781AbhCFWMr (ORCPT ); Sat, 6 Mar 2021 17:12:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229642AbhCFWMm (ORCPT ); Sat, 6 Mar 2021 17:12:42 -0500 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA0AAC06174A for ; Sat, 6 Mar 2021 14:12:42 -0800 (PST) Received: by mail-pl1-x633.google.com with SMTP id c16so3143756ply.0 for ; Sat, 06 Mar 2021 14:12:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=2bcl5+AurQSgRcbj7Yms06zqNQhuPyePfjam/kIHgAw=; b=bDML/VAvIqHiDN6m3e/VdLawIdC5JWjuEnppYJcH/ZyZT7jV1CMuX5SygqULF2gqvs h9i4HndSOyM/6575rfIXKgSTuGKjmrHI+OOBabQpDClvaN6YANFzsWLMf8NlT//zD2nb Lxe662d8GMnjJhTGf/W8n8X5WqDay6lLuDCk8= 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:mime-version :content-transfer-encoding; bh=2bcl5+AurQSgRcbj7Yms06zqNQhuPyePfjam/kIHgAw=; b=cEBhajpfd0ICBJwJPTuw+zqfOv90YWheI5Qwq8xaa7hoU5K+bNIgi03Hmg/hUJiast YDcyGa8erpxmqbd1Gxu3VVvaQNkMN+vaD79BV/QRGTTRDUrXPKtEtzEr72uZRmmFNZWQ lgGodmdL1Wg4/fkKYiMl9nHy+6/r3Zi2iY765Mdo+/U1OGl24aKUp8/Pu1bm6UmhtQ1E pFXllPC2uKw1rFZATjZKWQ7LN043IJWQnle+EhU/AQiyiYjx2A0Eh4+P/ozgPQ1SdYFi R+mkUFSzevmLQO3UCfxI+hFMEIhJlv/Ngb0FEkSz1DIbaxDrInw7d8kzf0ydsEqKJouI 08XQ== X-Gm-Message-State: AOAM532RCFbcG3tu+LslBmF2ozgHoT9jtuuhUagJmsLs7vRQlrDnfW3g LXxWJKZMAIn7GdfxEZA0Ix7NmA== X-Google-Smtp-Source: ABdhPJyiodb5Px1FihIdQnDiVPlTzMncBanKsJIH3Vm8vx+bWweJr02Asj7bzUEN/WoyxDRy6eBj+g== X-Received: by 2002:a17:90a:db01:: with SMTP id g1mr17363202pjv.127.1615068762140; Sat, 06 Mar 2021 14:12:42 -0800 (PST) Received: from grundler-glapstation.lan ([2600:1700:3ec2:905f:9c5:ceb0:502e:f28d]) by smtp.gmail.com with ESMTPSA id n125sm5763198pfn.21.2021.03.06.14.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 14:12:40 -0800 (PST) From: Grant Grundler To: Oliver Neukum , Jakub Kicinski Cc: Roland Dreier , nic_swsd , netdev , "David S . Miller" , LKML , Andrew Lunn , Grant Grundler Subject: [PATCH net-next] net: usb: cdc_ncm: emit dev_err on error paths Date: Sat, 6 Mar 2021 14:12:31 -0800 Message-Id: <20210306221232.3382941-1-grundler@chromium.org> X-Mailer: git-send-email 2.30.1.766.gb4fecdf3b7-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Several error paths in bind/probe code will only emit output using dev_dbg. But if we are going to fail the bind/probe, emit related output with "err" priority. Signed-off-by: Grant Grundler --- drivers/net/usb/cdc_ncm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Reposting to net-next per instructions in https://www.spinics.net/lists/netdev/msg715496.html I've applied this patch to most chromeos kernels: https://chromium-review.googlesource.com/q/hashtag:usbnet-rtl8156-support diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 5a78848db93f..25498c311551 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -849,17 +849,17 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ /* check if we got everything */ if (!ctx->data) { - dev_dbg(&intf->dev, "CDC Union missing and no IAD found\n"); + dev_err(&intf->dev, "CDC Union missing and no IAD found\n"); goto error; } if (cdc_ncm_comm_intf_is_mbim(intf->cur_altsetting)) { if (!ctx->mbim_desc) { - dev_dbg(&intf->dev, "MBIM functional descriptor missing\n"); + dev_err(&intf->dev, "MBIM functional descriptor missing\n"); goto error; } } else { if (!ctx->ether_desc || !ctx->func_desc) { - dev_dbg(&intf->dev, "NCM or ECM functional descriptors missing\n"); + dev_err(&intf->dev, "NCM or ECM functional descriptors missing\n"); goto error; } } @@ -868,7 +868,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ if (ctx->data != ctx->control) { temp = usb_driver_claim_interface(driver, ctx->data, dev); if (temp) { - dev_dbg(&intf->dev, "failed to claim data intf\n"); + dev_err(&intf->dev, "failed to claim data intf\n"); goto error; } } @@ -924,7 +924,7 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ if (ctx->ether_desc) { temp = usbnet_get_ethernet_addr(dev, ctx->ether_desc->iMACAddress); if (temp) { - dev_dbg(&intf->dev, "failed to get mac address\n"); + dev_err(&intf->dev, "failed to get mac address\n"); goto error2; } dev_info(&intf->dev, "MAC-Address: %pM\n", dev->net->dev_addr);