From patchwork Sat Feb 28 03:54:07 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo-Fu Tseng X-Patchwork-Id: 23867 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 1B3F1DDDFF for ; Sat, 28 Feb 2009 14:55:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753929AbZB1DzV (ORCPT ); Fri, 27 Feb 2009 22:55:21 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753906AbZB1DzV (ORCPT ); Fri, 27 Feb 2009 22:55:21 -0500 Received: from cooldavid.org ([220.133.139.86]:33366 "EHLO cooldavid.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752912AbZB1DzU (ORCPT ); Fri, 27 Feb 2009 22:55:20 -0500 Received: from cooldavid.org (localhost [127.0.0.1]) by cooldavid.org (Postfix) with ESMTP id 32670F0F7; Sat, 28 Feb 2009 11:54:08 +0800 (CST) From: "Guo-Fu Tseng" To: Jeff Garzik , David Miller Cc: netdev@vger.kernel.org, Ethan Reply-To: cooldavid@cooldavid.org Subject: [PATCH net-next-2.6 1/4] jme: Modifies messages to display correct hardware version Date: Sat, 28 Feb 2009 11:54:07 +0800 Message-Id: <20090228035408.M42101@cooldavid.org> In-Reply-To: <20081008215853.M53590@cooldavid.org> References: <20080915165101.M68109@cooldavid.org> <48D27CDA.50501@pobox.com> <20081008215853.M53590@cooldavid.org> X-Mailer: Open WebMail 2.51 20050228 X-OriginatingIP: 140.117.176.176 (cooldavid) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch modifies messages to display correct hardware version. Signed-off-by: Guo-Fu Tseng --- 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/jme.c b/drivers/net/jme.c index 08b3405..60cb997 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c @@ -2856,7 +2856,11 @@ jme_init_one(struct pci_dev *pdev, goto err_out_free_shadow; } - msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n", + msg_probe(jme, "%s%s ver:%x rev:%x macaddr:%pM\n", + (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC250) ? + "JMC250 Gigabit Ethernet" : + (jme->pdev->device == PCI_DEVICE_ID_JMICRON_JMC260) ? + "JMC260 Fast Ethernet" : "Unknown", (jme->fpgaver != 0) ? " (FPGA)" : "", (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev, jme->rev, netdev->dev_addr); @@ -3002,7 +3006,7 @@ static struct pci_driver jme_driver = { static int __init jme_init_module(void) { - printk(KERN_INFO PFX "JMicron JMC250 gigabit ethernet " + printk(KERN_INFO PFX "JMicron JMC2XX ethernet " "driver version %s\n", DRV_VERSION); return pci_register_driver(&jme_driver); }