| 1 | --- a/pci.c |
| 2 | +++ b/pci.c |
| 3 | @@ -4309,7 +4309,7 @@ static __devinit int vlynq_probe(struct |
| 4 | addr = (u32)ioremap(vdev->mem_start, 0x1000); |
| 5 | if (!addr) { |
| 6 | printk(KERN_ERR "acx: %s: failed to remap io memory\n", |
| 7 | - vdev->dev.bus_id); |
| 8 | + dev_name(&vdev->dev)); |
| 9 | result = -ENXIO; |
| 10 | goto fail; |
| 11 | } |
| 12 | @@ -4323,7 +4323,7 @@ static __devinit int vlynq_probe(struct |
| 13 | ieee = ieee80211_alloc_hw(sizeof(struct acx_device), &acxpci_hw_ops); |
| 14 | if (!ieee) { |
| 15 | printk("acx: could not allocate ieee80211 structure %s\n", |
| 16 | - vdev->dev.bus_id); |
| 17 | + dev_name(&vdev->dev)); |
| 18 | goto fail_alloc_netdev; |
| 19 | } |
| 20 | ieee->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS; |
| 21 | @@ -4365,7 +4365,7 @@ static __devinit int vlynq_probe(struct |
| 22 | |
| 23 | printk("acx: found %s-based wireless network card at %s, irq:%d, " |
| 24 | "phymem:0x%x, mem:0x%p\n", |
| 25 | - match->name, vdev->dev.bus_id, adev->irq, |
| 26 | + match->name, dev_name(&vdev->dev), adev->irq, |
| 27 | vdev->mem_start, adev->iobase); |
| 28 | log(L_ANY, "acx: the initial debug setting is 0x%04X\n", acx_debug); |
| 29 | |
| 30 | @@ -4416,7 +4416,7 @@ static __devinit int vlynq_probe(struct |
| 31 | * firmware operations happening in parallel or uninitialized data */ |
| 32 | |
| 33 | |
| 34 | - acx_proc_register_entries(ieee); |
| 35 | + acx_proc_register_entries(ieee, 0); |
| 36 | |
| 37 | /* Now we have our device, so make sure the kernel doesn't try |
| 38 | * to send packets even though we're not associated to a network yet */ |
| 39 | @@ -4536,7 +4536,7 @@ static void vlynq_remove(struct vlynq_de |
| 40 | CLEAR_BIT(adev->dev_state_mask, ACX_STATE_IFACE_UP); |
| 41 | } |
| 42 | |
| 43 | - acx_proc_unregister_entries(adev->ieee); |
| 44 | + acx_proc_unregister_entries(adev->ieee, 0); |
| 45 | |
| 46 | /* finally, clean up PCI bus state */ |
| 47 | acxpci_s_delete_dma_regions(adev); |
| 48 | |
