Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit de4549cae088a74262834178b71fb25dbec2c376

Authored by Stephen Hemminger
Committed by Jeff Garzik
1 parent 421e02f0e9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

8139x: reduce message severity on driver overlap 

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 <shemminger@vyatta.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

Showing 2 changed files with 4 additions and 6 deletions Side-by-side Diff

drivers/net/8139cp.c
Diff comments   View file @ de4549c
... ... @@ -1836,10 +1836,9 @@
1836 1836  
1837 1837 if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
1838 1838 pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision < 0x20) {
1839   - dev_err(&pdev->dev,
1840   - "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip\n",
  1839 + dev_info(&pdev->dev,
  1840 + "This (id %04x:%04x rev %02x) is not an 8139C+ compatible chip, use 8139too\n",
1841 1841 pdev->vendor, pdev->device, pdev->revision);
1842   - dev_err(&pdev->dev, "Try the \"8139too\" driver instead.\n");
1843 1842 return -ENODEV;
1844 1843 }
1845 1844  
drivers/net/8139too.c
Diff comments   View file @ de4549c
... ... @@ -946,10 +946,9 @@
946 946 if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&
947 947 pdev->device == PCI_DEVICE_ID_REALTEK_8139 && pdev->revision >= 0x20) {
948 948 dev_info(&pdev->dev,
949   - "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip\n",
  949 + "This (id %04x:%04x rev %02x) is an enhanced 8139C+ chip, use 8139cp\n",
950 950 pdev->vendor, pdev->device, pdev->revision);
951   - dev_info(&pdev->dev,
952   - "Use the \"8139cp\" driver for improved performance and stability.\n");
  951 + return -ENODEV;
953 952 }
954 953  
955 954 if (pdev->vendor == PCI_VENDOR_ID_REALTEK &&