summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir A. Nazarenko <naszar@ya.ru>2014-10-09 05:33:33 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-10-20 02:30:13 (GMT)
commit402eede3c0b29949cb9c46fcbc2d476c5d266d76 (patch)
treed7a5056e08928ceb70804d5eeb10af4347245333
parentebf72ccf53f0fd494c41e856f255d09bc19d2ff4 (diff)
downloadlinux-402eede3c0b29949cb9c46fcbc2d476c5d266d76.tar.xz
staging: vt6655: remove useless #if 1
There is code encapsulated in #if 1, let's remove it. Signed-off-by: Vladimir A. Nazarenko <naszar@ya.ru> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/vt6655/device_main.c4
-rw-r--r--drivers/staging/vt6655/wpactl.c3
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c
index ff8bd7a..6a77f0d 100644
--- a/drivers/staging/vt6655/device_main.c
+++ b/drivers/staging/vt6655/device_main.c
@@ -854,8 +854,6 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
return -ENODEV;
}
-#if 1
-
#ifdef DEBUG
pr_debug("after get pci_info memaddr is %x, io addr is %x,io_size is %d\n", pDevice->memaddr, pDevice->ioaddr, pDevice->io_size);
@@ -894,8 +892,6 @@ vt6655_probe(struct pci_dev *pcid, const struct pci_device_id *ent)
}
#endif
-#endif
-
pDevice->PortOffset = ioremap(pDevice->memaddr & PCI_BASE_ADDRESS_MEM_MASK, pDevice->io_size);
if (pDevice->PortOffset == NULL) {
diff --git a/drivers/staging/vt6655/wpactl.c b/drivers/staging/vt6655/wpactl.c
index dab1e80..cc39829 100644
--- a/drivers/staging/vt6655/wpactl.c
+++ b/drivers/staging/vt6655/wpactl.c
@@ -550,8 +550,6 @@ static int wpa_get_scan(struct vnt_private *pDevice,
int ret = 0;
u16 count = 0;
u16 ii, jj;
-#if 1
-
unsigned char *ptempBSS;
ptempBSS = kmalloc(sizeof(KnownBSS), GFP_ATOMIC);
@@ -583,7 +581,6 @@ static int wpa_get_scan(struct vnt_private *pDevice,
}
kfree(ptempBSS);
-#endif
//******mike:bubble sort by stronger RSSI*****//