tracing: Replace syscall_meta_data struct array with pointer array

[linux.git] / drivers / net / tokenring / tmspci.c

diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index f92fe86fdcae2266c08eb773049c86883aeed81e..d3e788a9cd1c9ea90c29fd41f31d37e1dd5f9ebe 100644 (file)
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -57,7 +57,7 @@ static struct card_info card_info_table[] = {
        { {0x03, 0x01}, "3Com Token Link Velocity"},
 };
 
-static struct pci_device_id tmspci_pci_tbl[] = {
+static DEFINE_PCI_DEVICE_TABLE(tmspci_pci_tbl) = {
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
        { PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_TR, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 1 },
        { PCI_VENDOR_ID_TCONRAD, PCI_DEVICE_ID_TCONRAD_TOKENRING, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 2 },
@@ -125,18 +125,16 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
        dev->irq        = pci_irq_line;
        dev->dma        = 0;
 
-       printk("%s: %s\n", dev->name, cardinfo->name);
-       printk("%s:    IO: %#4lx  IRQ: %d\n",
-              dev->name, dev->base_addr, dev->irq);
+       dev_info(&pdev->dev, "%s\n", cardinfo->name);
+       dev_info(&pdev->dev, "    IO: %#4lx  IRQ: %d\n", dev->base_addr, dev->irq);
                
        tms_pci_read_eeprom(dev);
 
-       printk("%s:    Ring Station Address: %pM\n",
-              dev->name, dev->dev_addr);
+       dev_info(&pdev->dev, "    Ring Station Address: %pM\n", dev->dev_addr);
                
        ret = tmsdev_init(dev, &pdev->dev);
        if (ret) {
-               printk("%s: unable to get memory for dev->priv.\n", dev->name);
+               dev_info(&pdev->dev, "unable to get memory for dev->priv.\n");
                goto err_out_region;
        }