@@ -837,12 +837,9 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
spin_lock_init(&sc->lmc_lock);
pci_set_master(pdev);
- printk(KERN_INFO "%s: detected at %lx, irq %d\n", dev->name,
- dev->base_addr, dev->irq);
-
err = register_hdlc_device(dev);
if (err) {
- printk(KERN_ERR "%s: register_netdev failed.\n", dev->name);
+ dev_err(&pdev->dev, "lmc: register_hdlc_device() failed.\n");
free_netdev(dev);
goto err_hdlcdev;
}
@@ -860,27 +857,27 @@ static int __devinit lmc_init_one(struct pci_dev *pdev,
switch (subdevice) {
case PCI_DEVICE_ID_LMC_HSSI:
- printk(KERN_INFO "%s: LMC HSSI\n", dev->name);
+ dev_info(&pdev->dev, "%s = LMC HSSI\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_HSSI;
sc->lmc_media = &lmc_hssi_media;
break;
case PCI_DEVICE_ID_LMC_DS3:
- printk(KERN_INFO "%s: LMC DS3\n", dev->name);
+ dev_info(&pdev->dev, "%s = LMC DS3\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_DS3;
sc->lmc_media = &lmc_ds3_media;
break;
case PCI_DEVICE_ID_LMC_SSI:
- printk(KERN_INFO "%s: LMC SSI\n", dev->name);
+ dev_info(&pdev->dev, "%s = LMC SSI\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_SSI;
sc->lmc_media = &lmc_ssi_media;
break;
case PCI_DEVICE_ID_LMC_T1:
- printk(KERN_INFO "%s: LMC T1\n", dev->name);
+ dev_info(&pdev->dev, "%s = LMC T1\n", dev->name);
sc->lmc_cardtype = LMC_CARDTYPE_T1;
sc->lmc_media = &lmc_t1_media;
break;
default:
- printk(KERN_WARNING "%s: LMC UNKNOWN CARD!\n", dev->name);
+ dev_warn(&pdev->dev, "%s = LMC UNKNOWN CARD!\n", dev->name);
break;
}