From patchwork Mon Jun 18 07:19:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 138853 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp3624688lji; Mon, 18 Jun 2018 00:19:46 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLCbzgOMidQIPQJJt/fJ1ncmVPa4hdaAFYuwXpBXbhYugWOW83Gz5fxm38P6h124R9A4pUo X-Received: by 2002:a65:5ac9:: with SMTP id d9-v6mr9990132pgt.238.1529306386452; Mon, 18 Jun 2018 00:19:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529306386; cv=none; d=google.com; s=arc-20160816; b=PMhJP/G+/42yXr2I0PCpBBY4fs5tlbcBeh4nB33VsA8/M0NuOJ3H6ErxeXrnMkfcb/ whadkboFiFX9e2w/Kae0fs+RxtlnbeExVMZA8/4cNZGOY/5bmKNoCmWPYGrez5Q45d7t OqnGljXNqNvQ3cc/GNRPgD7xMv3UxvlP1elY4RvIiwcVpPIkvPkSXIGHf2XUicbJw65u U4hr+oE1qKnyS6V0k3rS0pw6R7yEVa8YdyeKoM9oK0VqpPD1oDW1ZJ5CO2ixPgzLCfuw QnfMCwEGc8uYVQI2OFaSJ2cB3JTyh64+Mtb/7AmFgFtUXmpUt//XDvv+wctym0U/HDN+ cctQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=CDk5JiIfisTTBMT/Xb80X/B7O6fJ3gDwr/oUVABwraw=; b=bflzEpyGVLoHYXyomjMSO32/l49QfI7RF37DJQLdcqy3b3YaYYqUGHIUM40olSrIgD WnFRpFtGF3+WVA86aXzYQiLZ8UzMgiisiSzYkYnLReGQgJXlBbpC/NAmKViSTjDc7FPr pjLNQJXjJa4Ia/G7TCX4uJc/FlCTNXpzRKEWKJYLCUnNtUo+glF5z4aZ8bVQn3kafamW lAhbODyNi9/Vd8SyXEL/scwdko7LCWYn01i2te7s9PeKiY/SD4jC/kefB6N4TS4ieXfa NHdiMZ6iXTROKjd40baHHTeUbHQBDvdKAQg0kKkTsQog1LIGnoTWzT9+svPo/TBCJVwf rN4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=CvxI9N+I; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i64-v6si14773122pli.431.2018.06.18.00.19.46; Mon, 18 Jun 2018 00:19:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=CvxI9N+I; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932792AbeFRHTo (ORCPT + 9 others); Mon, 18 Jun 2018 03:19:44 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:43428 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932510AbeFRHTn (ORCPT ); Mon, 18 Jun 2018 03:19:43 -0400 Received: by mail-pf0-f194.google.com with SMTP id y8-v6so7700573pfm.10 for ; Mon, 18 Jun 2018 00:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=CDk5JiIfisTTBMT/Xb80X/B7O6fJ3gDwr/oUVABwraw=; b=CvxI9N+IpENYvsS4pFGApPDFn4lxYCnsvjZCh9n3K6MprhvsLpM6w9ckNrJoq5W3kY IeNQT17IKqeSFvTHA+ARRY7xoy4xwWq7q5B+Vr7caCAV7xuW57HSBJmSfjAhcVWF5ccn 7c5Qy9QoXT0+3UdqDsh5fHz7NWzNkwNjdNMkmBU3VTmk7HrVicaQg3OiDESakSwVwYpi Bdq3/KPjeLCgRCvTb3gV+2KgQCHZLMCzRnIUo5B33p6QJqQ/ZOrBmXwr35o9DdGUDXWU 7wlCYjYAXxRz6DM2/ctrf17PY5zZFhwdiPpl1skQqv012KQ4x7RWgVn38it3WnqkXToY IG/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=CDk5JiIfisTTBMT/Xb80X/B7O6fJ3gDwr/oUVABwraw=; b=r/gMUc8eH1gqCsuIFZvWjtNwjc8+SwDF/+MUVWLA+Lfxdr+bfG9RDazkYXOZC0F9qe oK67nBQU1o8NVfD514lGuXXFQzR032OR04jzKO5+qG48LAtDUSborX5wYzGxtitRXCvR EYNXr/CE9LlJnZ+UBEVhAMjiQ57JEkB6ziLw9Tksv57uQbiOHnjXmshG6XCwHiNwWScW 0Hy+gBttWDv8dUN6TSMmfaNVuYVzIYw9Yxu/UL5tCaEkK19t68ngbZpGXo/QYO1Eg/BD d9HRQdhX2mbJJB1TFg9RUCj8+Zjq+YnHeKfY/875GGNwH3OCw6ItFwG05UMUH1c/t48r iiHg== X-Gm-Message-State: APt69E0ALfgv8dlSqIo1lLcRThsINpyuaPhar3qZq3Y5QHWqBIWZAwmO +6ChjMxM/4RS4eQ334Ykrqw= X-Received: by 2002:a63:7a03:: with SMTP id v3-v6mr9774280pgc.285.1529306382469; Mon, 18 Jun 2018 00:19:42 -0700 (PDT) Received: from aurora.jms.id.au ([203.0.153.9]) by smtp.gmail.com with ESMTPSA id y15-v6sm20524896pfm.136.2018.06.18.00.19.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 18 Jun 2018 00:19:41 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 18 Jun 2018 16:49:37 +0930 From: Joel Stanley To: Samuel Mendoza-Jonas , "David S . Miller" Cc: netdev@vger.kernel.org Subject: [PATCH 3/4] net/ncsi: Use netdev_dbg for debug messages Date: Mon, 18 Jun 2018 16:49:15 +0930 Message-Id: <20180618071916.6765-4-joel@jms.id.au> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180618071916.6765-1-joel@jms.id.au> References: <20180618071916.6765-1-joel@jms.id.au> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This moves all of the netdev_printk(KERN_DEBUG, ...) messages over to netdev_dbg. There is no change in behaviour. Signed-off-by: Joel Stanley --- net/ncsi/ncsi-aen.c | 6 +++--- net/ncsi/ncsi-manage.c | 33 +++++++++++++++------------------ 2 files changed, 18 insertions(+), 21 deletions(-) -- 2.17.1 Acked-by: Samuel Mendoza-Jonas diff --git a/net/ncsi/ncsi-aen.c b/net/ncsi/ncsi-aen.c index f899ed61bb57..25e483e8278b 100644 --- a/net/ncsi/ncsi-aen.c +++ b/net/ncsi/ncsi-aen.c @@ -148,9 +148,9 @@ static int ncsi_aen_handler_hncdsc(struct ncsi_dev_priv *ndp, hncdsc = (struct ncsi_aen_hncdsc_pkt *)h; ncm->data[3] = ntohl(hncdsc->status); spin_unlock_irqrestore(&nc->lock, flags); - netdev_printk(KERN_DEBUG, ndp->ndev.dev, - "NCSI: host driver %srunning on channel %u\n", - ncm->data[3] & 0x1 ? "" : "not ", nc->id); + netdev_dbg(ndp->ndev.dev, + "NCSI: host driver %srunning on channel %u\n", + ncm->data[3] & 0x1 ? "" : "not ", nc->id); return 0; } diff --git a/net/ncsi/ncsi-manage.c b/net/ncsi/ncsi-manage.c index 716493a61ba6..091284760d21 100644 --- a/net/ncsi/ncsi-manage.c +++ b/net/ncsi/ncsi-manage.c @@ -788,8 +788,8 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) } break; case ncsi_dev_state_config_done: - netdev_printk(KERN_DEBUG, ndp->ndev.dev, - "NCSI: channel %u config done\n", nc->id); + netdev_dbg(ndp->ndev.dev, "NCSI: channel %u config done\n", + nc->id); spin_lock_irqsave(&nc->lock, flags); if (nc->reconfigure_needed) { /* This channel's configuration has been updated @@ -804,8 +804,7 @@ static void ncsi_configure_channel(struct ncsi_dev_priv *ndp) list_add_tail_rcu(&nc->link, &ndp->channel_queue); spin_unlock_irqrestore(&ndp->lock, flags); - netdev_printk(KERN_DEBUG, dev, - "Dirty NCSI channel state reset\n"); + netdev_dbg(dev, "Dirty NCSI channel state reset\n"); ncsi_process_next_channel(ndp); break; } @@ -908,9 +907,9 @@ static int ncsi_choose_active_channel(struct ncsi_dev_priv *ndp) } ncm = &found->modes[NCSI_MODE_LINK]; - netdev_printk(KERN_DEBUG, ndp->ndev.dev, - "NCSI: Channel %u added to queue (link %s)\n", - found->id, ncm->data[2] & 0x1 ? "up" : "down"); + netdev_dbg(ndp->ndev.dev, + "NCSI: Channel %u added to queue (link %s)\n", + found->id, ncm->data[2] & 0x1 ? "up" : "down"); out: spin_lock_irqsave(&ndp->lock, flags); @@ -1316,9 +1315,9 @@ static int ncsi_kick_channels(struct ncsi_dev_priv *ndp) if ((ndp->ndev.state & 0xff00) == ncsi_dev_state_config || !list_empty(&nc->link)) { - netdev_printk(KERN_DEBUG, nd->dev, - "NCSI: channel %p marked dirty\n", - nc); + netdev_dbg(nd->dev, + "NCSI: channel %p marked dirty\n", + nc); nc->reconfigure_needed = true; } spin_unlock_irqrestore(&nc->lock, flags); @@ -1336,8 +1335,7 @@ static int ncsi_kick_channels(struct ncsi_dev_priv *ndp) list_add_tail_rcu(&nc->link, &ndp->channel_queue); spin_unlock_irqrestore(&ndp->lock, flags); - netdev_printk(KERN_DEBUG, nd->dev, - "NCSI: kicked channel %p\n", nc); + netdev_dbg(nd->dev, "NCSI: kicked channel %p\n", nc); n++; } } @@ -1368,8 +1366,8 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) list_for_each_entry_rcu(vlan, &ndp->vlan_vids, list) { n_vids++; if (vlan->vid == vid) { - netdev_printk(KERN_DEBUG, dev, - "NCSI: vid %u already registered\n", vid); + netdev_dbg(dev, "NCSI: vid %u already registered\n", + vid); return 0; } } @@ -1388,7 +1386,7 @@ int ncsi_vlan_rx_add_vid(struct net_device *dev, __be16 proto, u16 vid) vlan->vid = vid; list_add_rcu(&vlan->list, &ndp->vlan_vids); - netdev_printk(KERN_DEBUG, dev, "NCSI: Added new vid %u\n", vid); + netdev_dbg(dev, "NCSI: Added new vid %u\n", vid); found = ncsi_kick_channels(ndp) != 0; @@ -1417,8 +1415,7 @@ int ncsi_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid) /* Remove the VLAN id from our internal list */ list_for_each_entry_safe(vlan, tmp, &ndp->vlan_vids, list) if (vlan->vid == vid) { - netdev_printk(KERN_DEBUG, dev, - "NCSI: vid %u found, removing\n", vid); + netdev_dbg(dev, "NCSI: vid %u found, removing\n", vid); list_del_rcu(&vlan->list); found = true; kfree(vlan); @@ -1545,7 +1542,7 @@ void ncsi_stop_dev(struct ncsi_dev *nd) } } - netdev_printk(KERN_DEBUG, ndp->ndev.dev, "NCSI: Stopping device\n"); + netdev_dbg(ndp->ndev.dev, "NCSI: Stopping device\n"); ncsi_report_link(ndp, true); } EXPORT_SYMBOL_GPL(ncsi_stop_dev);