From patchwork Wed Jan 7 16:40:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 17164 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org 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 65D16DE562 for ; Thu, 8 Jan 2009 03:48:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752938AbZAGQsw (ORCPT ); Wed, 7 Jan 2009 11:48:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752793AbZAGQsw (ORCPT ); Wed, 7 Jan 2009 11:48:52 -0500 Received: from mu-out-0910.google.com ([209.85.134.186]:25337 "EHLO mu-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752775AbZAGQsv (ORCPT ); Wed, 7 Jan 2009 11:48:51 -0500 Received: by mu-out-0910.google.com with SMTP id g7so3313730muf.1 for ; Wed, 07 Jan 2009 08:48:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:from:date:subject :mime-version:x-uid:x-length:to:content-type :content-transfer-encoding:content-disposition:message-id; bh=4A46NWgMzVcNdodVuGczporbJtuz2pes90c2BMpRWdY=; b=FB+MT+uDh3SAGNt+cwJedGEojNNgr1GZTRKCMUzd7IJ329Rz+QihFRS/IFG/0VD9fR UBoEUCjgEFMY+qGt6ZbK3pTo1wi6VVdU8L+7yjGulllLGBpg1oodl1llops4yk7jqiA1 c4irXer9tYnVlNIDP87IqC0w8cwvxMatEpH6c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:date:subject:mime-version:x-uid:x-length:to :content-type:content-transfer-encoding:content-disposition :message-id; b=ac7IbbkjywzKVamLQqN5cW6+cdY2gbAozbW7WwhQRT21ce0oVk+VwTSaMWkCMNbOdU Fh13DgMzo+jN1feb3DlxX85+3pJ4nTMVez9V6BqJVxCWxEGINcvVDfz7TRvAku3+ih/G 6w70FZNWsSRbdt+JMaTeEXWBy/blYGzu/ZItQ= Received: by 10.103.117.8 with SMTP id u8mr8336846mum.123.1231346434841; Wed, 07 Jan 2009 08:40:34 -0800 (PST) Received: from ?192.168.100.218? ([157.159.37.3]) by mx.google.com with ESMTPS id s11sm34183252mue.12.2009.01.07.08.40.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 07 Jan 2009 08:40:34 -0800 (PST) From: Florian Fainelli Date: Wed, 7 Jan 2009 17:40:30 +0100 Subject: [PATCH 1/4] r6040: make printks consistent with DRV_NAME MIME-Version: 1.0 X-UID: 22 X-Length: 3237 To: David Miller , Jeff Garzik , netdev@vger.kernel.org Content-Disposition: inline Message-Id: <200901071740.31046.florian@openwrt.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Florian Fainelli Subject: [PATCH 1/4] r6040: make printks consistent with DRV_NAME This patch fixes some printks which were not prefixed with DRV_NAME, useful when having multiple cards/drivers on the system. Signed-off-by: Florian Fainelli --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 9d2de32..3e685d7 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c @@ -200,7 +200,7 @@ struct r6040_private { static char version[] __devinitdata = KERN_INFO DRV_NAME ": RDC R6040 NAPI net driver," - "version "DRV_VERSION " (" DRV_RELDATE ")\n"; + "version "DRV_VERSION " (" DRV_RELDATE ")"; static int phy_table[] = { PHY1_ADDR, PHY2_ADDR }; @@ -330,7 +330,7 @@ static int r6040_alloc_rxbufs(struct net_device *dev) do { skb = netdev_alloc_skb(dev, MAX_BUF_SIZE); if (!skb) { - printk(KERN_ERR "%s: failed to alloc skb for rx\n", dev->name); + printk(KERN_ERR DRV_NAME "%s: failed to alloc skb for rx\n", dev->name); rc = -ENOMEM; goto err_exit; } @@ -1063,20 +1063,20 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, /* this should always be supported */ err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); if (err) { - printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses" + printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" "not supported by the card\n"); goto err_out; } err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); if (err) { - printk(KERN_ERR DRV_NAME "32-bit PCI DMA addresses" + printk(KERN_ERR DRV_NAME ": 32-bit PCI DMA addresses" "not supported by the card\n"); goto err_out; } /* IO Size check */ if (pci_resource_len(pdev, 0) < io_size) { - printk(KERN_ERR DRV_NAME "Insufficient PCI resources, aborting\n"); + printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n"); err = -EIO; goto err_out; } @@ -1086,7 +1086,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, dev = alloc_etherdev(sizeof(struct r6040_private)); if (!dev) { - printk(KERN_ERR DRV_NAME "Failed to allocate etherdev\n"); + printk(KERN_ERR DRV_NAME ": Failed to allocate etherdev\n"); err = -ENOMEM; goto err_out; } @@ -1102,7 +1102,7 @@ static int __devinit r6040_init_one(struct pci_dev *pdev, ioaddr = pci_iomap(pdev, bar, io_size); if (!ioaddr) { - printk(KERN_ERR "ioremap failed for device %s\n", + printk(KERN_ERR DRV_NAME ": ioremap failed for device %s\n", pci_name(pdev)); err = -EIO; goto err_out_free_res;