From 1c74b8a84126b7cfa3ef5ff7fc472277d5d046b9 Mon Sep 17 00:00:00 2001 From: Florian Pose <fp@igh-essen.com> Date: Thu, 15 Apr 2010 20:52:49 +0200 Subject: [PATCH] Removed printk(). --- devices/r8169-2.6.28-ethercat.c | 2 -- devices/r8169-2.6.29-ethercat.c | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/devices/r8169-2.6.28-ethercat.c b/devices/r8169-2.6.28-ethercat.c index f7ab4305..f86650f9 100644 --- a/devices/r8169-2.6.28-ethercat.c +++ b/devices/r8169-2.6.28-ethercat.c @@ -2392,8 +2392,6 @@ static void rtl_hw_start_8169(struct net_device *dev) void __iomem *ioaddr = tp->mmio_addr; struct pci_dev *pdev = tp->pci_dev; - printk(KERN_INFO "%s\n", __func__); - if (tp->mac_version == RTL_GIGA_MAC_VER_05) { RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | PCIMulRW); pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08); diff --git a/devices/r8169-2.6.29-ethercat.c b/devices/r8169-2.6.29-ethercat.c index f0109e27..86187c66 100644 --- a/devices/r8169-2.6.29-ethercat.c +++ b/devices/r8169-2.6.29-ethercat.c @@ -2212,12 +2212,12 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) rtl8169_init_phy(dev, tp); device_set_wakeup_enable(&pdev->dev, tp->features & RTL_FEATURE_WOL); + if (tp->ecdev && ecdev_open(tp->ecdev)) { ecdev_withdraw(tp->ecdev); goto err_out_msi_5; } - out: return rc; @@ -2428,8 +2428,6 @@ static void rtl_hw_start_8169(struct net_device *dev) void __iomem *ioaddr = tp->mmio_addr; struct pci_dev *pdev = tp->pci_dev; - printk(KERN_INFO "%s\n", __func__); - if (tp->mac_version == RTL_GIGA_MAC_VER_05) { RTL_W16(CPlusCmd, RTL_R16(CPlusCmd) | PCIMulRW); pci_write_config_byte(pdev, PCI_CACHE_LINE_SIZE, 0x08); -- GitLab