diff options
| author | Malcolm Priestley <[email protected]> | 2014-07-28 21:43:30 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2014-07-30 17:07:32 -0700 |
| commit | fbf515b81569585c8f404bc12fbcc59e44fdcd85 (patch) | |
| tree | cb173cd5105f4a6b9c197e2bf11113d20a9ddf11 | |
| parent | 33c1576ea1feb1817600aad4299537e92b90ebb5 (diff) | |
staging: vt6655: dead code remove undefined macro IO_MAP
This device is always memory mapped
Signed-off-by: Malcolm Priestley <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
| -rw-r--r-- | drivers/staging/vt6655/device_main.c | 10 | ||||
| -rw-r--r-- | drivers/staging/vt6655/upc.h | 34 |
2 files changed, 1 insertions, 43 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index e8584fd565c5..926c0d99f549 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -902,10 +902,6 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent) VNSvInPortB(pDevice->PortOffset+0x4F, &value); pr_debug("After write: value is %x\n", value); #endif - -#ifdef IO_MAP - pDevice->PortOffset = pDevice->ioaddr; -#endif // do reset if (!MACbSoftwareReset(pDevice->PortOffset)) { pr_err(DEVICE_NAME ": Failed to access MAC hardware..\n"); @@ -949,14 +945,10 @@ static void device_print_info(PSDevice pDevice) DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: %s\n", dev->name, get_chip_name(pDevice->chip_id)); DBG_PRT(MSG_LEVEL_INFO, KERN_INFO "%s: MAC=%pM", dev->name, dev->dev_addr); -#ifdef IO_MAP - DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " IO=0x%lx ", (unsigned long)pDevice->ioaddr); - DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " IRQ=%d\n", pDevice->dev->irq); -#else + DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " IO=0x%lx Mem=0x%lx ", (unsigned long)pDevice->ioaddr, (unsigned long)pDevice->PortOffset); DBG_PRT(MSG_LEVEL_INFO, KERN_INFO " IRQ=%d\n", pDevice->dev->irq); -#endif } static void vt6655_init_info(struct pci_dev *pcid, PSDevice *ppDevice, diff --git a/drivers/staging/vt6655/upc.h b/drivers/staging/vt6655/upc.h index af12a86cd086..e262f1b00e66 100644 --- a/drivers/staging/vt6655/upc.h +++ b/drivers/staging/vt6655/upc.h @@ -35,38 +35,6 @@ /*--------------------- Export Definitions -------------------------*/ // -// For IO mapped -// - -#ifdef IO_MAP - -#define VNSvInPortB(dwIOAddress, pbyData) \ -do { \ - *(pbyData) = inb(dwIOAddress); \ -} while (0) - -#define VNSvInPortW(dwIOAddress, pwData) \ -do { \ - *(pwData) = inw(dwIOAddress); \ -} while (0) - -#define VNSvInPortD(dwIOAddress, pdwData) \ -do { \ - *(pdwData) = inl(dwIOAddress); \ -} while (0) - -#define VNSvOutPortB(dwIOAddress, byData) \ - outb(byData, dwIOAddress) - -#define VNSvOutPortW(dwIOAddress, wData) \ - outw(wData, dwIOAddress) - -#define VNSvOutPortD(dwIOAddress, dwData) \ - outl(dwData, dwIOAddress) - -#else - -// // For memory mapped IO // @@ -100,8 +68,6 @@ do { \ writel((unsigned long)dwData, dwIOAddress); \ } while (0) -#endif - // // ALWAYS IO-Mapped IO when in 16-bit/32-bit environment // |