aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/tokenring
diff options
context:
space:
mode:
authorMeelis Roos <mroos@linux.ee>2010-09-20 17:19:03 -0400
committerDavid S. Miller <davem@davemloft.net>2010-09-21 21:04:44 -0400
commitd9fd1b2857154f1ac32ca041641ba947525ff7fa (patch)
tree4b33a0eaffc598683216d36c5ac401696c4752db /drivers/net/tokenring
parent73da16c28ed0724755afdb95c7dd6b166381be10 (diff)
tmspci: fix tr%d in printk
tmspci driver uses dev->name before register_netdev() and so prints tr%d in initialization messages. Fix it by using dev_info. Found and tested on real hardware. Signed-off-by: Meelis Roos <mroos@linux.ee> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/tokenring')
-rw-r--r--drivers/net/tokenring/tmspci.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index d4c7c0c0a3d6..d3e788a9cd1c 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -125,18 +125,16 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
125 dev->irq = pci_irq_line; 125 dev->irq = pci_irq_line;
126 dev->dma = 0; 126 dev->dma = 0;
127 127
128 printk("%s: %s\n", dev->name, cardinfo->name); 128 dev_info(&pdev->dev, "%s\n", cardinfo->name);
129 printk("%s: IO: %#4lx IRQ: %d\n", 129 dev_info(&pdev->dev, " IO: %#4lx IRQ: %d\n", dev->base_addr, dev->irq);
130 dev->name, dev->base_addr, dev->irq);
131 130
132 tms_pci_read_eeprom(dev); 131 tms_pci_read_eeprom(dev);
133 132
134 printk("%s: Ring Station Address: %pM\n", 133 dev_info(&pdev->dev, " Ring Station Address: %pM\n", dev->dev_addr);
135 dev->name, dev->dev_addr);
136 134
137 ret = tmsdev_init(dev, &pdev->dev); 135 ret = tmsdev_init(dev, &pdev->dev);
138 if (ret) { 136 if (ret) {
139 printk("%s: unable to get memory for dev->priv.\n", dev->name); 137 dev_info(&pdev->dev, "unable to get memory for dev->priv.\n");
140 goto err_out_region; 138 goto err_out_region;
141 } 139 }
142 140