From patchwork Thu Apr 26 21:44:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 905391 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=quarantine dis=none) header.from=broadcom.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=broadcom.com header.i=@broadcom.com header.b="gUDtGGwF"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40X9b707svz9ry1 for ; Fri, 27 Apr 2018 07:45:07 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756261AbeDZVpE (ORCPT ); Thu, 26 Apr 2018 17:45:04 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:45450 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755293AbeDZVpB (ORCPT ); Thu, 26 Apr 2018 17:45:01 -0400 Received: by mail-pf0-f194.google.com with SMTP id c10so31579pfi.12 for ; Thu, 26 Apr 2018 14:45:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=8DmLYY6AsRT1FYFfi4/FX+dIjv7D7LwCmEF5ke+e+wU=; b=gUDtGGwFfqfs18fT1bENsjO8pyrd1DAchE3ffxdBt39Zw3vTfHClZwFHhRxurlc+vQ 3q7VVkoyowORL+NZ1NkNGMrYOuZtoYlnMRwAgDjZtQes17L6y2Em10qKiHBhwzUciE1l +UuEMqfzncHiBQhGot9m6yDjlwKlH8kLNoedI= 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; bh=8DmLYY6AsRT1FYFfi4/FX+dIjv7D7LwCmEF5ke+e+wU=; b=dio0LLwokc2v80SZx52jetEHzVIWG4Ozcf4fUnDpT9uYh3MkgA7mKxpDQfihCWZcrG LC1crW6joRpn6S+kiO9kQME3kzpyTz3XFRiB28cht+0QPne43dIKsp3cZg0+Tc/y1Ay4 yESPHpiiGXxMlubgsUN97T+jq4mUVSJvMSAURatDJXFFfZO4yPxF+2yW1kkKaqpEX1ES tpLtuOx5qyU6Fu7yRHk8CyFcpwG/El2gc04P9jk/aILW8JjnDe2/HJDY2oYkGut5Lgzx TedI3JgeYM/eCb0UEVHUgJdQyBRuzRYPxxYR3D+K0hASySs1ZIMHz6dP9QlVpGZ7hBB2 hT1A== X-Gm-Message-State: ALQs6tDWMmzfpp614YFzQtueTNIRF+7s6hkIlCV6SvnLZrVwA2VsTXz1 0gZqCPRZkMvwVycaVOH+SHAZ2w== X-Google-Smtp-Source: AIpwx49zqunl2Sm9D7EMhD9H5nLKJ72b9X+iiVM5fYJ3e00utEIxhJzNpDEN+oayBKaoazanvIqj6w== X-Received: by 10.99.37.196 with SMTP id l187mr29128961pgl.221.1524779100429; Thu, 26 Apr 2018 14:45:00 -0700 (PDT) Received: from localhost.dhcp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id w7sm36026384pfn.83.2018.04.26.14.44.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Apr 2018 14:44:59 -0700 (PDT) From: Michael Chan To: davem@davemloft.net Cc: netdev@vger.kernel.org Subject: [PATCH net-next v2 05/14] bnxt_en: Simplify ring alloc/free error messages. Date: Thu, 26 Apr 2018 17:44:35 -0400 Message-Id: <1524779084-4016-6-git-send-email-michael.chan@broadcom.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1524779084-4016-1-git-send-email-michael.chan@broadcom.com> References: <1524779084-4016-1-git-send-email-michael.chan@broadcom.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replace switch statements printing different messages for every ring type with a common message. Signed-off-by: Michael Chan --- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 43 +++++-------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index aff4b4e..b83c2ac 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4336,26 +4336,9 @@ static int hwrm_ring_alloc_send_msg(struct bnxt *bp, mutex_unlock(&bp->hwrm_cmd_lock); if (rc || err) { - switch (ring_type) { - case RING_FREE_REQ_RING_TYPE_L2_CMPL: - netdev_err(bp->dev, "hwrm_ring_alloc cp failed. rc:%x err:%x\n", - rc, err); - return -1; - - case RING_FREE_REQ_RING_TYPE_RX: - netdev_err(bp->dev, "hwrm_ring_alloc rx failed. rc:%x err:%x\n", - rc, err); - return -1; - - case RING_FREE_REQ_RING_TYPE_TX: - netdev_err(bp->dev, "hwrm_ring_alloc tx failed. rc:%x err:%x\n", - rc, err); - return -1; - - default: - netdev_err(bp->dev, "Invalid ring\n"); - return -1; - } + netdev_err(bp->dev, "hwrm_ring_alloc type %d failed. rc:%x err:%x\n", + ring_type, rc, err); + return -EIO; } ring->fw_ring_id = ring_id; return rc; @@ -4479,23 +4462,9 @@ static int hwrm_ring_free_send_msg(struct bnxt *bp, mutex_unlock(&bp->hwrm_cmd_lock); if (rc || error_code) { - switch (ring_type) { - case RING_FREE_REQ_RING_TYPE_L2_CMPL: - netdev_err(bp->dev, "hwrm_ring_free cp failed. rc:%d\n", - rc); - return rc; - case RING_FREE_REQ_RING_TYPE_RX: - netdev_err(bp->dev, "hwrm_ring_free rx failed. rc:%d\n", - rc); - return rc; - case RING_FREE_REQ_RING_TYPE_TX: - netdev_err(bp->dev, "hwrm_ring_free tx failed. rc:%d\n", - rc); - return rc; - default: - netdev_err(bp->dev, "Invalid ring\n"); - return -1; - } + netdev_err(bp->dev, "hwrm_ring_free type %d failed. rc:%x err:%x\n", + ring_type, rc, error_code); + return -EIO; } return 0; }