From mboxrd@z Thu Jan 1 00:00:00 1970 From: Joe Perches Subject: Re: [PATCH] e1000e: Use pr_ and netdev_ Date: Wed, 24 Mar 2010 16:43:00 -0700 Message-ID: <1269474180.1541.11.camel@Joe-Laptop.home> References: <20100324225529.7104.17189.stgit@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: davem@davemloft.net, netdev@vger.kernel.org, gospo@redhat.com, Bruce Allan To: Jeff Kirsher Return-path: Received: from mail.perches.com ([173.55.12.10]:1066 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751541Ab0CXXnD (ORCPT ); Wed, 24 Mar 2010 19:43:03 -0400 In-Reply-To: <20100324225529.7104.17189.stgit@localhost.localdomain> Sender: netdev-owner@vger.kernel.org List-ID: On Wed, 2010-03-24 at 15:55 -0700, Jeff Kirsher wrote: > From: Bruce Allan > As an alternative to a quite large patch previously submitted by Joe > Perches to make use of kernel logging API, this patch is much less > intrusive. [] > diff --git a/drivers/net/e1000e/e1000.h b/drivers/net/e1000e/e1000.h > index 118bdf4..23ab67c 100644 > --- a/drivers/net/e1000e/e1000.h > +++ b/drivers/net/e1000e/e1000.h > @@ -42,25 +42,16 @@ > > struct e1000_info; > > -#define e_printk(level, adapter, format, arg...) \ > - printk(level "%s: %s: " format, pci_name(adapter->pdev), \ > - adapter->netdev->name, ## arg) > - > -#ifdef DEBUG > #define e_dbg(format, arg...) \ > - e_printk(KERN_DEBUG , hw->adapter, format, ## arg) > -#else > -#define e_dbg(format, arg...) do { (void)(hw); } while (0) > -#endif > - > + netdev_dbg(hw->adapter->netdev, format, ## arg) > #define e_err(format, arg...) \ > - e_printk(KERN_ERR, adapter, format, ## arg) > + netdev_err(adapter->netdev, format, ## arg) > #define e_info(format, arg...) \ > - e_printk(KERN_INFO, adapter, format, ## arg) > + netdev_info(adapter->netdev, format, ## arg) > #define e_warn(format, arg...) \ > - e_printk(KERN_WARNING, adapter, format, ## arg) > + netdev_warn(adapter->netdev, format, ## arg) > #define e_notice(format, arg...) \ > - e_printk(KERN_NOTICE, adapter, format, ## arg) > + netdev_notice(adapter->netdev, format, ## arg) Macros that use global variables are undesirable. I think there's value in using standard mechanisms. cheers, Joe