From patchwork Fri May 15 20:22:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Beregalov X-Patchwork-Id: 27284 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id D49A5B7063 for ; Sat, 16 May 2009 06:23:24 +1000 (EST) Received: by ozlabs.org (Postfix) id C7FC0DE0DC; Sat, 16 May 2009 06:23:24 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 6DADADE073 for ; Sat, 16 May 2009 06:23:24 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753058AbZEOUXL (ORCPT ); Fri, 15 May 2009 16:23:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753111AbZEOUXK (ORCPT ); Fri, 15 May 2009 16:23:10 -0400 Received: from fg-out-1718.google.com ([72.14.220.159]:11594 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752694AbZEOUXH (ORCPT ); Fri, 15 May 2009 16:23:07 -0400 Received: by fg-out-1718.google.com with SMTP id d23so204368fga.17 for ; Fri, 15 May 2009 13:23:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=my/l59mwq3G+ktzjHYRwmzrfziDX2j5pX0NFTiAGYqc=; b=M7qXZkYYvOvfHlS7xhfzHdhIpHFNPFldT9vF5s4cSVJUVhillULcElDjIOX3UdqKE9 7pp987C6PZe/K83S91/wmzzGeeoQ6m/e4Jx52B/B6ddEC7rdk7Rv7A7PTZ+qbASyN+Yy SrOWEzIf2WV5xVr/vRZNDhCL1slIZXGjWfPPU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=o2eydFCKizlQWt7sESiWLb99oIJYy6c4hKV2/jpmGEMsp58LGPvq6JkN8CtbXu3vxT RbFhDAiN7rxvPSANBj/ckKIOOyFrREjaJ9+VT24E6VvNijT1W/n9glms+Xy1GK6erHBp zxEfmjA8t6twFA32fV/gzxquiOK3qES9LGWUg= Received: by 10.86.31.18 with SMTP id e18mr4113265fge.72.1242418987205; Fri, 15 May 2009 13:23:07 -0700 (PDT) Received: from localhost.localdomain (ppp91-76-229-232.pppoe.mtu-net.ru [91.76.229.232]) by mx.google.com with ESMTPS id l12sm1366684fgb.21.2009.05.15.13.23.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 15 May 2009 13:23:06 -0700 (PDT) From: Alexander Beregalov To: netdev@vger.kernel.org Cc: Alexander Beregalov Subject: [PATCH 2/5] de600: convert PRINTK() to pr_debug() Date: Sat, 16 May 2009 00:22:39 +0400 Message-Id: <1242418962-1272-2-git-send-email-a.beregalov@gmail.com> X-Mailer: git-send-email 1.6.3 In-Reply-To: <1242418962-1272-1-git-send-email-a.beregalov@gmail.com> References: <1242418962-1272-1-git-send-email-a.beregalov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Also remove de600_debug as it is not needed. Signed-off-by: Alexander Beregalov --- drivers/net/de600.c | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/net/de600.c b/drivers/net/de600.c index de63f1d..c866ca9 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c @@ -38,14 +38,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj /* Add more time here if your adapter won't work OK: */ #define DE600_SLOW_DOWN udelay(delay_time) -/* use 0 for production, 1 for verification, >2 for debug */ -#ifdef DE600_DEBUG -#define PRINTK(x) if (de600_debug >= 2) printk x -#else -#define DE600_DEBUG 0 -#define PRINTK(x) /**/ -#endif - #include #include #include @@ -67,10 +59,6 @@ static const char version[] = "de600.c: $Revision: 1.41-2.5 $, Bjorn Ekwall (bj #include "de600.h" -static unsigned int de600_debug = DE600_DEBUG; -module_param(de600_debug, int, 0); -MODULE_PARM_DESC(de600_debug, "DE-600 debug level (0-2)"); - static unsigned int check_lost = 1; module_param(check_lost, bool, 0); MODULE_PARM_DESC(check_lost, "If set then check for unplugged de600"); @@ -193,7 +181,7 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) } /* Start real output */ - PRINTK(("de600_start_xmit:len=%d, page %d/%d\n", skb->len, tx_fifo_in, free_tx_pages)); + pr_debug("de600_start_xmit:len=%d, page %d/%d\n", skb->len, tx_fifo_in, free_tx_pages); if ((len = skb->len) < RUNT) len = RUNT; @@ -259,7 +247,7 @@ static irqreturn_t de600_interrupt(int irq, void *dev_id) irq_status = de600_read_status(dev); do { - PRINTK(("de600_interrupt (%02X)\n", irq_status)); + pr_debug("de600_interrupt (%02X)\n", irq_status); if (irq_status & RX_GOOD) de600_rx_intr(dev); @@ -407,8 +395,7 @@ static struct net_device * __init de600_probe(void) printk(KERN_INFO "%s: D-Link DE-600 pocket adapter", dev->name); /* Alpha testers must have the version number to report bugs. */ - if (de600_debug > 1) - printk(version); + pr_debug("%s", version); /* probe for adapter */ err = -ENODEV;