From patchwork Wed Oct 22 01:04:27 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stephen hemminger X-Patchwork-Id: 5284 X-Patchwork-Delegate: jgarzik@pobox.com 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 F102ADDDE3 for ; Wed, 22 Oct 2008 12:04:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752018AbYJVBEb (ORCPT ); Tue, 21 Oct 2008 21:04:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751957AbYJVBEb (ORCPT ); Tue, 21 Oct 2008 21:04:31 -0400 Received: from mail.vyatta.com ([76.74.103.46]:59804 "EHLO mail.vyatta.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751843AbYJVBEa (ORCPT ); Tue, 21 Oct 2008 21:04:30 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by mail.vyatta.com (Postfix) with ESMTP id C4CE24F4283; Tue, 21 Oct 2008 18:04:30 -0700 (PDT) X-Virus-Scanned: amavisd-new at Received: from mail.vyatta.com ([127.0.0.1]) by localhost (mail.vyatta.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tVzDC9gfkjcu; Tue, 21 Oct 2008 18:04:30 -0700 (PDT) Received: from extreme (unknown [96.225.231.79]) by mail.vyatta.com (Postfix) with ESMTP id 53CB74F420C; Tue, 21 Oct 2008 18:04:30 -0700 (PDT) Date: Tue, 21 Oct 2008 18:04:27 -0700 From: Stephen Hemminger To: Francois Romieu , Jeff Garzik Cc: netdev@vger.kernel.org Subject: [PATCH] 8139x: reduce message severity on driver overlap Message-ID: <20081021180427.6d4668d7@extreme> Organization: Vyatta X-Mailer: Claws Mail 3.3.1 (GTK+ 2.12.9; x86_64-pc-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The 8139 drivers are a source of error messages that confuse users. Since this device can not be disambiguated by normal PCI device id's two drivers match the same info. But the module utilities seem to correctly handle this overlap, they try one driver, then if that doesn't load try the other. Therefore there is no need for a message to be logged with error level severity, just using info level instead. Can't be completely silent because user might have configure one driver and forgot the other one. Signed-off-by: Stephen Hemminger --- 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 --- a/drivers/net/8139cp.c 2008-10-21 17:51:23.000000000 -0700 +++ b/drivers/net/8139cp.c 2008-10-21 17:58:00.000000000 -0700 @@ -1836,10 +1836,9 @@ static int cp_init_one (struct pci_dev * if (pdev->vendor == PCI_VENDOR_ID_REALTEK && pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision < 0x20) { - dev_err(&pdev->dev, - "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n", + dev_info(&pdev->dev, + "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip, use 8139too\n", pdev->vendor, pdev->device, pdev->revision); - dev_err(&pdev->dev, "Try the \"8139too\" driver instead.\n"); return -ENODEV; } --- a/drivers/net/8139too.c 2008-10-21 17:51:27.000000000 -0700 +++ b/drivers/net/8139too.c 2008-10-21 17:58:01.000000000 -0700 @@ -946,10 +946,9 @@ static int __devinit rtl8139_init_one (s if (pdev->vendor == PCI_VENDOR_ID_REALTEK && pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision >= 0x20) { dev_info(&pdev->dev, - "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n", + "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip, use 8139cp\n", pdev->vendor, pdev->device, pdev->revision); - dev_info(&pdev->dev, - "Use the \"8139cp\" driver for improved performance and stability.\n"); + return -ENODEV; } if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&