diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-10-29 17:43:46 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-29 13:31:29 -0700 |
| commit | bc5d431c9b11f39c81dea25748e18014f3e210f4 (patch) | |
| tree | fe4a8c2defcff31b88748c07234b913e61af6593 | |
| parent | 000fe0f53433a4dea2738c3cb34e19d2ef952092 (diff) | |
| download | op-kernel-dev-bc5d431c9b11f39c81dea25748e18014f3e210f4.zip op-kernel-dev-bc5d431c9b11f39c81dea25748e18014f3e210f4.tar.gz | |
staging: vt6655: mac80211 conversion: device_print_info remove netdevice.
use dev_info for device name and pcid->irq for irq number.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index b0f94a80..5ece184 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -809,12 +809,11 @@ static const struct net_device_ops device_netdev_ops = { static void device_print_info(struct vnt_private *pDevice) { - struct net_device *dev = pDevice->dev; + dev_info(&pDevice->pcid->dev, "%s\n", get_chip_name(pDevice->chip_id)); - pr_info("%s: %s\n", dev->name, get_chip_name(pDevice->chip_id)); - pr_info("%s: MAC=%pM IO=0x%lx Mem=0x%lx IRQ=%d\n", - dev->name, dev->dev_addr, (unsigned long)pDevice->ioaddr, - (unsigned long)pDevice->PortOffset, pDevice->dev->irq); + dev_info(&pDevice->pcid->dev, "MAC=%pM IO=0x%lx Mem=0x%lx IRQ=%d\n", + pDevice->abyCurrentNetAddr, (unsigned long)pDevice->ioaddr, + (unsigned long)pDevice->PortOffset, pDevice->pcid->irq); } static void vt6655_init_info(struct pci_dev *pcid, |
